From 4953e964152013f6d3d5f7172c9f2dacfed63294 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 24 May 2024 10:44:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat=20:=20=E9=9C=80=E6=B1=82=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E8=A1=A8=E5=8D=95=E6=9D=83=E9=99=90=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/collection/add.vue   | 31 +++++++++++----
 .../project-demand/collection/detail.vue      | 39 +++++++++++++------
 src/views/project-demand/collection/index.vue |  2 +-
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index bb9188d..74ebe73 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -3,14 +3,14 @@
     <baseTitle title="需求征集信息录入"></baseTitle>
     <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
       <div class="left-info">
-        <el-form-item label="名称" prop="requirementName">
+        <el-form-item v-if="checkFormPrem('requirementName')" label="名称" prop="requirementName">
           <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
-        <el-form-item label="所属公司" prop="companyIds">
+        <el-form-item v-if="checkFormPrem('companyIds')" label="所属公司" prop="companyIds">
           <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
                           filterable clearable :check-strictly="true" multiple/>
         </el-form-item>
-        <el-form-item label="征集类型" prop="collectType">
+        <el-form-item v-if="checkFormPrem('collectType')" label="征集类型" prop="collectType">
           <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
             <el-option
                 v-for="item in typeOption"
@@ -20,7 +20,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="截止时间" prop="deadline">
+        <el-form-item v-if="checkFormPrem('deadline')" label="截止时间" prop="deadline">
           <el-config-provider>
             <el-date-picker
                 v-model="formData.deadline"
@@ -33,11 +33,12 @@
       </div>
     </el-form>
     <baseTitle title="征集说明"></baseTitle>
-    <Tinymce image-url="/notice/file" file-url="/notice/file" v-model:value="formData.collectExplain" height="300"
-             v-if="showTinymce"/>
+    <Tinymce  v-if="checkFormPrem('collectExplain') && showTinymce" image-url="/notice/file" file-url="/notice/file"
+              v-model:value="formData.collectExplain" height="300" />
     <baseTitle title="申请文件"></baseTitle>
-    <file-upload @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig" :data="formData.fileList"
+    <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
+    <fvTable style="width: 100%;max-height: 200px" v-if="showTable"
+             :tableConfig="tableConfig" :data="formData.fileList"
              :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -105,6 +106,7 @@ const loading = ref(false)
 const showTable = ref(true)
 const processStore = useProcessStore()
 const processInstanceData = ref()
+const formPermMap = ref(new Map());
 const rules = reactive({
   requirementName: [{required: true, message: '请输入名称', trigger: 'blur'}],
   companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
@@ -154,6 +156,16 @@ const tableConfig = reactive({
   ]
 })
 
+const checkFormPrem = (formKey) => {
+  if (formPermMap.value.hasOwnProperty(formKey)) {
+    let formItem = formPermMap.value[formKey];
+    return formItem.perm  === 'EDIT'
+  } else {
+    return true;
+  }
+
+}
+
 const handleDownload = (row) => {
   downloadFile(row.fileId).then(res => {
     const blob = new Blob([res])
@@ -207,6 +219,9 @@ const init = async () => {
       processStore.noTakeList.value = data.noTakeList;
       processStore.refuseList.value = data.refuseList;
       processStore.passList.value = data.passList;
+      formPermMap.value = data.formPermMap
+      // const entriesArray = Object.entries(data.formPermMap);// 使用Map构造函数将键值对数组转换为Map对象
+      // formPermMap.value = new Map(entriesArray);
       nextTick(() => {
         processDiagramViewer.value = true
       })
diff --git a/src/views/project-demand/collection/detail.vue b/src/views/project-demand/collection/detail.vue
index 3ac3f10..05f951e 100644
--- a/src/views/project-demand/collection/detail.vue
+++ b/src/views/project-demand/collection/detail.vue
@@ -3,28 +3,28 @@
     <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
       <baseTitle title="需求征集详情"></baseTitle>
       <el-row>
-        <el-col :span="12">
+        <el-col :span="12" v-if="checkFormPrem('requirementName')">
           <el-form-item label="名称">
             <span>{{ formData.requirementName }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="checkFormPrem('companyIds')">
           <el-form-item label="所属公司">
             <span>{{ formData.companyIds }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="checkFormPrem('collectType')">
           <el-form-item label="征集类型">
             <span>{{ formData.collectType }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="checkFormPrem('deadline')">
           <el-form-item label="截止时间">
             <span>{{ formData.deadline }}</span>
           </el-form-item>
         </el-col>
         <baseTitle title="征集说明"></baseTitle>
-        <el-col :span="24">
+        <el-col :span="24" v-if="checkFormPrem('collectExplain')">
           <el-form-item>
             <el-card style="width: 100%">
               <div v-html="formData.collectExplain">
@@ -33,7 +33,7 @@
           </el-form-item>
         </el-col>
         <baseTitle title="附件列表"></baseTitle>
-        <el-col :span="24">
+        <el-col :span="24" v-if="checkFormPrem('collectExplain')">
           <el-form-item>
             <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
                      :data="formData.fileList" :isSettingCol="false" :pagination="false">
@@ -77,7 +77,7 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo, agreeTask, rejectTask,downloadFile} from "@/api/project-demand/index.js";
+import {getInfo, agreeTask, rejectTask, downloadFile} from "@/api/project-demand/index.js";
 import {getSubCompOpt} from '@/api/user/user.js'
 import {ElMessage} from "element-plus";
 import {useTagsView} from '@/stores/tagsview.js'
@@ -91,6 +91,7 @@ const loading = ref(false)
 const demandForm = ref()
 const processStore = useProcessStore()
 const companyOption = ref([])
+const formPermMap = ref(new Map());
 const processInstanceData = ref({})
 const showTable = ref(false)
 const processDiagramViewer = ref(false)
@@ -137,6 +138,22 @@ const tableConfig = reactive({
     }
   ]
 })
+
+const checkFormPrem = (formKey) => {
+  if (formPermMap.value.hasOwnProperty(formKey)) {
+    let formItem = formPermMap.value[formKey];
+    return formItem.perm === 'READ'
+  } else {
+    return true;
+  }
+}
+
+
+const fromPrem = (formKey) => {
+  let formItem = formPermMap.value[formKey];
+  return formItem.perm
+}
+
 const handleSubmit = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,
@@ -184,7 +201,7 @@ const getCompanyOption = async () => {
 const getDataSourceOptionItem = (val) => {
   if (val !== undefined) {
     val.forEach(item => {
-      matterTree(companyNameArray.value,companyOption.value, item)
+      matterTree(companyNameArray.value, companyOption.value, item)
     })
   }
   return companyNameArray.value.join('，');
@@ -194,7 +211,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()
   })
@@ -203,7 +220,7 @@ const init = async () => {
   if (!route.query.id) return;
   await getCompanyOption()
   getInfo(route.query.id).then(res => {
-    loading.value=false
+    loading.value = false
     let data = res.data
     formData.value = data.formData;
     data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
@@ -221,7 +238,7 @@ const init = async () => {
   })
 }
 onMounted(async () => {
-  loading.value=true
+  loading.value = true
   await init()
 })
 </script>
diff --git a/src/views/project-demand/collection/index.vue b/src/views/project-demand/collection/index.vue
index 4d4d90d..a74c025 100644
--- a/src/views/project-demand/collection/index.vue
+++ b/src/views/project-demand/collection/index.vue
@@ -100,7 +100,7 @@ const tableConfig = reactive({
           btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-          btn.push({label: '编辑',prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
         // if (buttons.has("delete")) {
         //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})

From a8e56fe985ac9f8fae768097c09549f65a23e3c1 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Fri, 24 May 2024 14:24:36 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=AD=89=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/permisstion.js                     | 29 ++++++++++++++++---
 src/views/project-demand/collection/index.vue |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js
index e1864fe..473b1b8 100644
--- a/src/stores/permisstion.js
+++ b/src/stores/permisstion.js
@@ -1,10 +1,11 @@
 import { defineStore } from "pinia";
-import { defineAsyncComponent, ref } from "vue";
+import { defineAsyncComponent, ref, toRaw } from "vue";
 import { getRouters } from "@/api/system/menu";
 import Layout from '@/layout/index.vue'
 import ParentView from '@/components/ParentView.vue'
 import router from "../router";
 const VueComUrl = import.meta.glob('../views/**/*.vue')
+console.log(VueComUrl, 'VueComUrl');
 
 export const usePermisstionStroe = defineStore('permisstion', () => {
   const asyncRouters = ref([])
@@ -21,6 +22,8 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
       }
     }
   ])
+  // 二级页面路由list
+  const slRouters = ref([])
 
   const setIsLoadRoutes = (status) => {
     return isLoadRoutes.value = status
@@ -30,7 +33,10 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
       if (res.code === 1000) {
         const sRouter = JSON.parse(JSON.stringify(res.data))
         const mData = JSON.parse(JSON.stringify(res.data))
-        asyncRouters.value = formatAsyncRouters(sRouter)
+        console.log(JSON.parse(JSON.stringify(sRouter)), 'sRouter');
+        const firstFormat = setRouterLevel(JSON.parse(JSON.stringify(sRouter)))
+        console.log(firstFormat, 'firstFormat');
+        asyncRouters.value = formatAsyncRouters(JSON.parse(JSON.stringify(firstFormat)))
         menuList.value = [...menuList.value, ...generateMenu(mData)]
         addAsyncRouters(asyncRouters.value)
         isLoadRoutes.value = false
@@ -41,6 +47,21 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
     })
   }
 
+  const setRouterLevel = (routers) => {
+    return routers.filter(item=>{
+      if(item.component === 'Layout') {
+        item.children.forEach(v=>{
+          if(v.children) {
+            slRouters.value = [...toRaw(slRouters.value), ...v.children]
+            delete v.children
+          }
+        })
+        item.children = [...item.children, ...toRaw(slRouters.value)]
+      }
+      return true
+    })
+  }
+
   const formatAsyncRouters = (routers) => {
     return routers.filter(route => {
       if (route.component) {
@@ -48,8 +69,8 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
           route.component = Layout
         } else if (route.component === 'ParentView') {
           route.component = ParentView
-        }
-        else {
+        } else {
+          console.log(route.component, 'route.component');
           route.component = loadView(route.component)
         }
       }
diff --git a/src/views/project-demand/collection/index.vue b/src/views/project-demand/collection/index.vue
index 4d4d90d..d462fd6 100644
--- a/src/views/project-demand/collection/index.vue
+++ b/src/views/project-demand/collection/index.vue
@@ -149,7 +149,7 @@ const search = (val) => {
 const handleAdd = () => {
   //新增
   router.push({
-    name: 'Requirement/add',
+    name: 'Requirement/edit',
     query: {
       isAdd: 1
     }

From 9013d54addcaba0c7f86f9c43271f4f025065875 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Fri, 24 May 2024 14:26:29 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/permisstion.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js
index 473b1b8..ac0f064 100644
--- a/src/stores/permisstion.js
+++ b/src/stores/permisstion.js
@@ -5,7 +5,6 @@ import Layout from '@/layout/index.vue'
 import ParentView from '@/components/ParentView.vue'
 import router from "../router";
 const VueComUrl = import.meta.glob('../views/**/*.vue')
-console.log(VueComUrl, 'VueComUrl');
 
 export const usePermisstionStroe = defineStore('permisstion', () => {
   const asyncRouters = ref([])
@@ -35,7 +34,6 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
         const mData = JSON.parse(JSON.stringify(res.data))
         console.log(JSON.parse(JSON.stringify(sRouter)), 'sRouter');
         const firstFormat = setRouterLevel(JSON.parse(JSON.stringify(sRouter)))
-        console.log(firstFormat, 'firstFormat');
         asyncRouters.value = formatAsyncRouters(JSON.parse(JSON.stringify(firstFormat)))
         menuList.value = [...menuList.value, ...generateMenu(mData)]
         addAsyncRouters(asyncRouters.value)
@@ -70,7 +68,6 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
         } else if (route.component === 'ParentView') {
           route.component = ParentView
         } else {
-          console.log(route.component, 'route.component');
           route.component = loadView(route.component)
         }
       }

From 6af7bf9d2f1760388031ba587076d9905254bce6 Mon Sep 17 00:00:00 2001
From: lilinyuan <1084668738@qq.com>
Date: Fri, 24 May 2024 16:10:15 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/permisstion.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/stores/permisstion.js b/src/stores/permisstion.js
index ac0f064..c6d2477 100644
--- a/src/stores/permisstion.js
+++ b/src/stores/permisstion.js
@@ -48,13 +48,15 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
   const setRouterLevel = (routers) => {
     return routers.filter(item=>{
       if(item.component === 'Layout') {
-        item.children.forEach(v=>{
-          if(v.children) {
-            slRouters.value = [...toRaw(slRouters.value), ...v.children]
-            delete v.children
-          }
-        })
-        item.children = [...item.children, ...toRaw(slRouters.value)]
+        if(item.children) {
+          item.children.forEach(v=>{
+            if(v.children) {
+              slRouters.value = [...toRaw(slRouters.value), ...v.children]
+              delete v.children
+            }
+          })
+          item.children = [...item.children, ...toRaw(slRouters.value)]
+        }
       }
       return true
     })

From 08f66803a2f5b33f9ed88bcabdcf58a37cb69e7b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 24 May 2024 16:34:17 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                      |   2 +-
 src/views/project-demand/collection/add.vue   |   6 +-
 .../project-demand/collection/detail.vue      |   4 +-
 src/views/project-demand/requirement/add.vue  | 348 ++++++++++++++++++
 .../project-demand/requirement/detail.vue     | 281 ++++++++++++++
 .../project-demand/requirement/index.vue      | 202 ++++++++++
 6 files changed, 837 insertions(+), 6 deletions(-)
 create mode 100644 src/views/project-demand/requirement/add.vue
 create mode 100644 src/views/project-demand/requirement/detail.vue
 create mode 100644 src/views/project-demand/requirement/index.vue

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index c885c31..446106a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -156,7 +156,7 @@ const handleView = (row) => {
   console.log('row', row)
   if(row.targetState=='00'&&row.targetId){
     router.push({
-      name: 'Collection/detail',
+      name: 'Requirement/detail',
       query: {
         id: row.targetId
       }
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index 74ebe73..e9f863b 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -177,7 +177,7 @@ const handleDownload = (row) => {
 }
 const compositeParam = (item) => {
   let tag = ''
-  if (!formData.value.collectType && router.currentRoute.value.name === 'Collection/add') {
+  if (!formData.value.collectType && router.currentRoute.value.name === 'Requirement/add') {
     tag = '需求征集'
   }
   return {
@@ -257,7 +257,7 @@ const handleSubmit = async (instance) => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       await router.push({
-        name: 'Collection'
+        name: 'Requirement'
       })
     } else {
       ElMessage.error(res.msg)
@@ -270,7 +270,7 @@ const handleResubmit = () => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        name: 'Collection'
+        name: 'Requirement'
       })
     } else {
       ElMessage.error(res.msg)
diff --git a/src/views/project-demand/collection/detail.vue b/src/views/project-demand/collection/detail.vue
index 05f951e..c59a55c 100644
--- a/src/views/project-demand/collection/detail.vue
+++ b/src/views/project-demand/collection/detail.vue
@@ -165,7 +165,7 @@ const handleSubmit = () => {
       ElMessage.success(res.msg)
       tagsViewStore.delVisitedViews(router.currentRoute.value.path)
       router.push({
-        name: 'Collection'
+        name: 'Requirement'
       })
     } else {
       ElMessage.error(res.msg)
@@ -185,7 +185,7 @@ const handleReject = (instance) => {
         ElMessage.success(res.msg)
         tagsViewStore.delVisitedViews(router.currentRoute.value.path)
         router.push({
-          name: 'Collection'
+          name: 'Requirement'
         })
       } else {
         ElMessage.error(res.msg)
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
new file mode 100644
index 0000000..e9f863b
--- /dev/null
+++ b/src/views/project-demand/requirement/add.vue
@@ -0,0 +1,348 @@
+<template>
+  <div v-loading="loading" class="add-block">
+    <baseTitle title="需求征集信息录入"></baseTitle>
+    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
+      <div class="left-info">
+        <el-form-item v-if="checkFormPrem('requirementName')" label="名称" prop="requirementName">
+          <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item v-if="checkFormPrem('companyIds')" label="所属公司" prop="companyIds">
+          <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
+                          filterable clearable :check-strictly="true" multiple/>
+        </el-form-item>
+        <el-form-item v-if="checkFormPrem('collectType')" label="征集类型" prop="collectType">
+          <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
+            <el-option
+                v-for="item in typeOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="checkFormPrem('deadline')" label="截止时间" prop="deadline">
+          <el-config-provider>
+            <el-date-picker
+                v-model="formData.deadline"
+                type="datetime"
+                placeholder="截止时间"
+                value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-config-provider>
+        </el-form-item>
+      </div>
+    </el-form>
+    <baseTitle title="征集说明"></baseTitle>
+    <Tinymce  v-if="checkFormPrem('collectExplain') && showTinymce" image-url="/notice/file" file-url="/notice/file"
+              v-model:value="formData.collectExplain" height="300" />
+    <baseTitle title="申请文件"></baseTitle>
+    <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
+    <fvTable style="width: 100%;max-height: 200px" v-if="showTable"
+             :tableConfig="tableConfig" :data="formData.fileList"
+             :isSettingCol="false" :pagination="false">
+      <template #empty>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+      </template>
+    </fvTable>
+    <div class="approval-record">
+      <baseTitle title="流程"></baseTitle>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
+      <!--      <div class="process" id="approvalRecord">-->
+      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
+      <!--      </div>-->
+    </div>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(demandForm)">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
+      <el-button @click="handleBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import {useAuthStore} from '@/stores/userstore.js'
+import {useProcessStore} from '@/stores/processStore.js';
+import {
+  getWorkflowInfo,
+  addRequirement,
+  getFormInfo,
+  resubmit,
+  deleteFile,
+  downloadFile
+} from "@/api/project-demand/index.js";
+import FileUpload from "@/components/FileUpload.vue";
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {useRoute, useRouter} from 'vue-router'
+import {getSubCompOpt} from '@/api/user/user.js'
+import {useTagsView} from '@/stores/tagsview.js'
+
+const tagsViewStore = useTagsView()
+const authStore = useAuthStore()
+const router = useRouter()
+const route = useRoute()
+const demandForm = ref()
+const dateValue = ref()
+const formData = ref({
+  requirementName: '',
+  companyIds: '',
+  collectType: '',
+  deadline: '',
+  collectExplain: '',
+  fileList: []
+})
+const showTinymce = ref(true)
+const processDiagramViewer = ref(false)
+const typeOption = ref([
+  {
+    label: "需求征集",
+    value: '需求征集'
+  }
+])
+const companyOption = ref([])
+const form = ref(null)
+const fileList = ref([])
+const loading = ref(false)
+const showTable = ref(true)
+const processStore = useProcessStore()
+const processInstanceData = ref()
+const formPermMap = ref(new Map());
+const rules = reactive({
+  requirementName: [{required: true, message: '请输入名称', trigger: 'blur'}],
+  companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
+  collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
+  deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
+})
+
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+              <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
+
+const checkFormPrem = (formKey) => {
+  if (formPermMap.value.hasOwnProperty(formKey)) {
+    let formItem = formPermMap.value[formKey];
+    return formItem.perm  === 'EDIT'
+  } else {
+    return true;
+  }
+
+}
+
+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 compositeParam = (item) => {
+  let tag = ''
+  if (!formData.value.collectType && router.currentRoute.value.name === 'Requirement/add') {
+    tag = '需求征集'
+  }
+  return {
+    fileId: item.id,
+    size: item.size,
+    originalFileName: item.originalFilename,
+    fileType: item.fileType,
+    url: item.url,
+    processNodeTag: null,
+    tag: tag,
+    userId: authStore.userinfo.userId
+  }
+}
+const getFile = (val) => {
+  console.log('上传文件', val)
+  showTable.value = false
+  let fileObj = compositeParam(val)
+  formData.value.fileList.push(fileObj)
+  nextTick(() => {
+    showTable.value = true
+  })
+}
+
+const init = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+  getWorkflowInfo().then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      let data = res.data
+      processInstanceData.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;
+      formPermMap.value = data.formPermMap
+      // const entriesArray = Object.entries(data.formPermMap);// 使用Map构造函数将键值对数组转换为Map对象
+      // formPermMap.value = new Map(entriesArray);
+      nextTick(() => {
+        processDiagramViewer.value = true
+      })
+    } else {
+    }
+  })
+}
+const submitParam = (item) => {
+  let files = []
+  item.fileList.forEach(item => {
+    let obj = {
+      fileId: item.fileId,
+    }
+    files.push(obj)
+  })
+  return {
+    collectExplain: item.collectExplain,
+    collectType: item.collectType,
+    companyIds: item.companyIds,
+    deadline: item.deadline,
+    requirementId: item.requirementId ? item.requirementId : 0,
+    requirementName: item.requirementName,
+    fileList: files,
+    deploymentId: processInstanceData.value.deploymentId
+  }
+}
+const handleSubmit = async (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    let res = await addRequirement(submitParam(formData.value))
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      await router.push({
+        name: 'Requirement'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const handleResubmit = () => {
+  resubmit(submitParam(formData.value)).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Requirement'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const getDetailInfo = async () => {
+  getFormInfo(route.query.id).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      formData.value = res.data
+      showTinymce.value = false
+      showTable.value = false
+      nextTick(() => {
+        showTinymce.value = true
+        showTable.value = true
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+
+const handleBack = () => {
+  history.back()
+}
+const handleDelete = (row) => {
+  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteFile(row.fileId).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success("删除成功");
+        formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
+      }
+    });
+  }).catch(() => {
+    ElMessage.warning("用户取消删除! ");
+  })
+}
+
+onMounted(async () => {
+  loading.value = true
+  await init()
+  if (route.query.id) {
+    await getDetailInfo()
+  }
+  loading.value = false
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-empty__description) {
+  margin-top: 0;
+}
+
+.add-block {
+  //display: flex;
+  //justify-content: space-between;
+  overflow-x: hidden;
+  overflow-y: auto;
+
+  a {
+    cursor: pointer;
+    font-size: 14px;
+    color: #2a99ff;
+  }
+
+  .approval-record {
+    position: relative;
+  }
+}
+</style>
diff --git a/src/views/project-demand/requirement/detail.vue b/src/views/project-demand/requirement/detail.vue
new file mode 100644
index 0000000..c59a55c
--- /dev/null
+++ b/src/views/project-demand/requirement/detail.vue
@@ -0,0 +1,281 @@
+<template>
+  <div class="detail-block" v-loading="loading">
+    <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
+      <baseTitle title="需求征集详情"></baseTitle>
+      <el-row>
+        <el-col :span="12" v-if="checkFormPrem('requirementName')">
+          <el-form-item label="名称">
+            <span>{{ formData.requirementName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" v-if="checkFormPrem('companyIds')">
+          <el-form-item label="所属公司">
+            <span>{{ formData.companyIds }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" v-if="checkFormPrem('collectType')">
+          <el-form-item label="征集类型">
+            <span>{{ formData.collectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" v-if="checkFormPrem('deadline')">
+          <el-form-item label="截止时间">
+            <span>{{ formData.deadline }}</span>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="征集说明"></baseTitle>
+        <el-col :span="24" v-if="checkFormPrem('collectExplain')">
+          <el-form-item>
+            <el-card style="width: 100%">
+              <div v-html="formData.collectExplain">
+              </div>
+            </el-card>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="附件列表"></baseTitle>
+        <el-col :span="24" v-if="checkFormPrem('collectExplain')">
+          <el-form-item>
+            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
+                     :data="formData.fileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="processInstanceData.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="formData.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="processDiagramViewer" :operation-list="processInstanceData.operationList"
+                            :state="processInstanceData.state"/>
+          <process-diagram-viewer v-if="processDiagramViewer"/>
+        </div>
+      </div>
+    </el-form>
+    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
+      <el-button @click="handleReject(demandForm)">驳回</el-button>
+      <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
+import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
+import {useProcessStore} from '@/stores/processStore.js';
+import {getInfo, agreeTask, rejectTask, downloadFile} from "@/api/project-demand/index.js";
+import {getSubCompOpt} from '@/api/user/user.js'
+import {ElMessage} from "element-plus";
+import {useTagsView} from '@/stores/tagsview.js'
+import {matterTree} from '@/utils/matterTree.js';
+
+const tagsViewStore = useTagsView()
+const router = useRouter()
+const route = useRoute()
+const form = ref();
+const loading = ref(false)
+const demandForm = ref()
+const processStore = useProcessStore()
+const companyOption = ref([])
+const formPermMap = ref(new Map());
+const processInstanceData = ref({})
+const showTable = ref(false)
+const processDiagramViewer = ref(false)
+const processTree = ref()
+const companyNameArray = ref([])
+const formData = ref({})
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        return (
+            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+        )
+      }
+    }
+  ]
+})
+
+const checkFormPrem = (formKey) => {
+  if (formPermMap.value.hasOwnProperty(formKey)) {
+    let formItem = formPermMap.value[formKey];
+    return formItem.perm === 'READ'
+  } else {
+    return true;
+  }
+}
+
+
+const fromPrem = (formKey) => {
+  let formItem = formPermMap.value[formKey];
+  return formItem.perm
+}
+
+const handleSubmit = () => {
+  let approve = {
+    taskId: processInstanceData.value.taskId,
+    auditOpinion: formData.value.auditOpinion,
+    formData: formData.value
+  }
+  agreeTask(approve).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+      router.push({
+        name: 'Requirement'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const handleReject = (instance) => {
+  if (!instance) return
+  instance.validate(async (valid) => {
+    if (!valid) return
+    let approve = {
+      taskId: processInstanceData.value.taskId,
+      auditOpinion: formData.value.auditOpinion,
+    }
+    rejectTask(approve).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg)
+        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+        router.push({
+          name: 'Requirement'
+        })
+      } else {
+        ElMessage.error(res.msg)
+      }
+    })
+  })
+}
+const getCompanyOption = async () => {
+  const res = await getSubCompOpt()
+  companyOption.value = res.data
+}
+
+const getDataSourceOptionItem = (val) => {
+  if (val !== undefined) {
+    val.forEach(item => {
+      matterTree(companyNameArray.value, companyOption.value, item)
+    })
+  }
+  return companyNameArray.value.join('，');
+}
+
+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 init = async () => {
+  if (!route.query.id) return;
+  await getCompanyOption()
+  getInfo(route.query.id).then(res => {
+    loading.value = false
+    let data = res.data
+    formData.value = data.formData;
+    data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
+    processInstanceData.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(() => {
+      processDiagramViewer.value = true
+      showTable.value = true
+    })
+  })
+}
+onMounted(async () => {
+  loading.value = true
+  await init()
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-empty__description) {
+  margin-top: 0;
+}
+
+.detail-block {
+  overflow: hidden;
+  padding-right: 10px;
+
+  .info {
+    display: flex;
+    flex-wrap: wrap;
+
+    > div {
+      width: 350px;
+      margin-bottom: 15px;
+      margin-right: 10px;
+
+      > span:first-child {
+        color: black;
+        font-size: 16px;
+        font-weight: bold;
+      }
+    }
+  }
+
+  .approval-record {
+    padding-bottom: 30px;
+
+    .process {
+      position: relative;
+    }
+  }
+}
+
+</style>
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
new file mode 100644
index 0000000..da2c3b3
--- /dev/null
+++ b/src/views/project-demand/requirement/index.vue
@@ -0,0 +1,202 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+import {useAuthStore} from '@/stores/userstore.js'
+import Tag from '@/components/Tag.vue'
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {ElMessage} from "element-plus";
+import {deleteDemand} from "@/api/project-demand";
+
+const authStore = useAuthStore()
+const router = useRouter()
+const searchConfig = reactive([
+  {
+    label: '需求名称',
+    prop: 'requirementName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '征集类型',
+    prop: 'collectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择征集类型',
+      clearable: true,
+      filterable: true,
+      cacheKey: 'todo_type'
+    }
+  }
+])
+const tableIns = ref()
+const userInfo = ref(authStore.userinfo)
+const tableConfig = reactive({
+  columns: [
+    {
+      type: 'selection',
+      prop: 'selection'
+    },
+    {
+      prop: 'requirementName',
+      label: '需求名称',
+      align: 'center'
+    },
+    {
+      prop: 'collectType',
+      label: '征集类型',
+      align: 'center'
+    },
+    {
+      prop: 'companyName',
+      label: '所属公司',
+      align: 'center',
+      currentRender: ({row, index}) => (
+          <div style={{width: '300px', textOverflow: 'ellipsis'}}>{row.companyName}</div>)
+    },
+    {
+      prop: 'approveName',
+      label: '审批人',
+      align: 'center'
+    },
+    {
+      prop: 'deadline',
+      label: '截止时间',
+      align: 'center'
+    },
+    {
+      prop: 'taskNode',
+      label: '当前节点',
+      align: 'center'
+    },
+    {
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      width: 200,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        let buttons = new Set(Array.from(row.buttons))
+        if (buttons.has("details")) {
+          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
+        }
+        if (buttons.has("edit")) {
+          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
+        }
+        // if (buttons.has("delete")) {
+        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
+        // }
+        if (buttons.has("report")) {
+          btn.push({label: '需求上报',prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
+        }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        v-perm={item.prem}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+              {
+                buttons.has("delete") ?
+                    <popover-delete name={row.requirementName} type={'需求征集'} btnType={'danger'} perm={['mosr:requirement:del']}
+                                    onDelete={() => handleDelete(row)}/> : ''
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '/workflow/mosr/requirement',
+  btns: [
+    {name: '新增', key: 'add', color: '#DED0B2'},
+    {name: '导出', key: 'export', type: ''},
+  ],
+  params: {}
+})
+
+console.log('userInfo', userInfo.value.userName)
+
+const search = (val) => {
+  tableConfig.params = {...val}
+  tableIns.value.refresh()
+}
+const handleAdd = () => {
+  //新增
+  router.push({
+    name: 'Requirement/add',
+    query: {
+      isAdd: 1
+    }
+  })
+}
+const handleEdit = (row) => {
+  router.push({
+    name: 'Requirement/edit',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+const handleDelete = (row) => {
+  deleteDemand(row.requirementId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tableIns.value.refresh()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const handleDetail = (row) => {
+  router.push({
+    name: 'Detail',
+    query: {
+      id: row.requirementId
+    }
+  })
+}
+const handleReport = (row) => {
+  router.push({
+    name: 'Summary/add',
+    query: {
+      id:row.requirementId
+    }
+  })
+}
+const headBtnClick = (key) => {
+  switch (key) {
+    case 'add':
+      handleAdd()
+      break;
+    case 'export':
+      handleExport()
+      break;
+  }
+}
+</script>

From 0ec14cfd9b05e9b84aa6a75d5bffb735f848705d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 27 May 2024 11:37:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=E6=9D=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue                |   3 +-
 src/views/project-demand/collection/add.vue   | 348 ------------------
 .../project-demand/collection/detail.vue      | 281 --------------
 src/views/project-demand/collection/index.vue | 202 ----------
 src/views/project-demand/summary/detail.vue   |   2 +-
 .../project-management/filing/detail.vue      |   2 +-
 .../implementation/detail.vue                 |   2 +-
 .../project-management/initiation/detail.vue  |   2 +-
 vite.config.js                                |  30 +-
 9 files changed, 20 insertions(+), 852 deletions(-)
 delete mode 100644 src/views/project-demand/collection/add.vue
 delete mode 100644 src/views/project-demand/collection/detail.vue
 delete mode 100644 src/views/project-demand/collection/index.vue

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 546904e..e372293 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -39,7 +39,7 @@ const props = defineProps({
   // 当前显示步骤
   active: {
     type: Number,
-    default: '0'
+    default:0
   },
   // 已完成的工作流步骤
   stepSuccess: {
@@ -236,7 +236,6 @@ const getBaseInfo = async () => {
 getBaseInfo()
 
 watchEffect(() => {
-  console.log(props.active, 'props.active');
   localActive.value = props.active
 })
 </script>
diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
deleted file mode 100644
index e9f863b..0000000
--- a/src/views/project-demand/collection/add.vue
+++ /dev/null
@@ -1,348 +0,0 @@
-<template>
-  <div v-loading="loading" class="add-block">
-    <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="formData" inline class="query-form" ref="demandForm" :rules="rules">
-      <div class="left-info">
-        <el-form-item v-if="checkFormPrem('requirementName')" label="名称" prop="requirementName">
-          <el-input v-model="formData.requirementName" placeholder="请输入名称" clearable></el-input>
-        </el-form-item>
-        <el-form-item v-if="checkFormPrem('companyIds')" label="所属公司" prop="companyIds">
-          <el-tree-select v-model="formData.companyIds" :data="companyOption" style="width: 100%;"
-                          filterable clearable :check-strictly="true" multiple/>
-        </el-form-item>
-        <el-form-item v-if="checkFormPrem('collectType')" label="征集类型" prop="collectType">
-          <el-select v-model="formData.collectType" placeholder="征集类型" clearable filterable>
-            <el-option
-                v-for="item in typeOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="checkFormPrem('deadline')" label="截止时间" prop="deadline">
-          <el-config-provider>
-            <el-date-picker
-                v-model="formData.deadline"
-                type="datetime"
-                placeholder="截止时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-            />
-          </el-config-provider>
-        </el-form-item>
-      </div>
-    </el-form>
-    <baseTitle title="征集说明"></baseTitle>
-    <Tinymce  v-if="checkFormPrem('collectExplain') && showTinymce" image-url="/notice/file" file-url="/notice/file"
-              v-model:value="formData.collectExplain" height="300" />
-    <baseTitle title="申请文件"></baseTitle>
-    <file-upload v-if="checkFormPrem('fileList')" @getFile="getFile"/>
-    <fvTable style="width: 100%;max-height: 200px" v-if="showTable"
-             :tableConfig="tableConfig" :data="formData.fileList"
-             :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-    <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
-      <!--      <div class="process" id="approvalRecord">-->
-      <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
-      <!--      </div>-->
-    </div>
-    <div class="oper-page-btn">
-      <el-button color="#DED0B2" @click="handleSubmit(demandForm)">提交</el-button>
-      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
-      <el-button @click="handleBack">返回</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import {useAuthStore} from '@/stores/userstore.js'
-import {useProcessStore} from '@/stores/processStore.js';
-import {
-  getWorkflowInfo,
-  addRequirement,
-  getFormInfo,
-  resubmit,
-  deleteFile,
-  downloadFile
-} from "@/api/project-demand/index.js";
-import FileUpload from "@/components/FileUpload.vue";
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
-import {useRoute, useRouter} from 'vue-router'
-import {getSubCompOpt} from '@/api/user/user.js'
-import {useTagsView} from '@/stores/tagsview.js'
-
-const tagsViewStore = useTagsView()
-const authStore = useAuthStore()
-const router = useRouter()
-const route = useRoute()
-const demandForm = ref()
-const dateValue = ref()
-const formData = ref({
-  requirementName: '',
-  companyIds: '',
-  collectType: '',
-  deadline: '',
-  collectExplain: '',
-  fileList: []
-})
-const showTinymce = ref(true)
-const processDiagramViewer = ref(false)
-const typeOption = ref([
-  {
-    label: "需求征集",
-    value: '需求征集'
-  }
-])
-const companyOption = ref([])
-const form = ref(null)
-const fileList = ref([])
-const loading = ref(false)
-const showTable = ref(true)
-const processStore = useProcessStore()
-const processInstanceData = ref()
-const formPermMap = ref(new Map());
-const rules = reactive({
-  requirementName: [{required: true, message: '请输入名称', trigger: 'blur'}],
-  companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
-  collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
-  deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
-})
-
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        return (
-            <div>
-              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-              <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
-            </div>
-        )
-      }
-    }
-  ]
-})
-
-const checkFormPrem = (formKey) => {
-  if (formPermMap.value.hasOwnProperty(formKey)) {
-    let formItem = formPermMap.value[formKey];
-    return formItem.perm  === 'EDIT'
-  } else {
-    return true;
-  }
-
-}
-
-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 compositeParam = (item) => {
-  let tag = ''
-  if (!formData.value.collectType && router.currentRoute.value.name === 'Requirement/add') {
-    tag = '需求征集'
-  }
-  return {
-    fileId: item.id,
-    size: item.size,
-    originalFileName: item.originalFilename,
-    fileType: item.fileType,
-    url: item.url,
-    processNodeTag: null,
-    tag: tag,
-    userId: authStore.userinfo.userId
-  }
-}
-const getFile = (val) => {
-  console.log('上传文件', val)
-  showTable.value = false
-  let fileObj = compositeParam(val)
-  formData.value.fileList.push(fileObj)
-  nextTick(() => {
-    showTable.value = true
-  })
-}
-
-const init = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-  getWorkflowInfo().then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      let data = res.data
-      processInstanceData.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;
-      formPermMap.value = data.formPermMap
-      // const entriesArray = Object.entries(data.formPermMap);// 使用Map构造函数将键值对数组转换为Map对象
-      // formPermMap.value = new Map(entriesArray);
-      nextTick(() => {
-        processDiagramViewer.value = true
-      })
-    } else {
-    }
-  })
-}
-const submitParam = (item) => {
-  let files = []
-  item.fileList.forEach(item => {
-    let obj = {
-      fileId: item.fileId,
-    }
-    files.push(obj)
-  })
-  return {
-    collectExplain: item.collectExplain,
-    collectType: item.collectType,
-    companyIds: item.companyIds,
-    deadline: item.deadline,
-    requirementId: item.requirementId ? item.requirementId : 0,
-    requirementName: item.requirementName,
-    fileList: files,
-    deploymentId: processInstanceData.value.deploymentId
-  }
-}
-const handleSubmit = async (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    let res = await addRequirement(submitParam(formData.value))
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      await router.push({
-        name: 'Requirement'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleResubmit = () => {
-  resubmit(submitParam(formData.value)).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Requirement'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const getDetailInfo = async () => {
-  getFormInfo(route.query.id).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      formData.value = res.data
-      showTinymce.value = false
-      showTable.value = false
-      nextTick(() => {
-        showTinymce.value = true
-        showTable.value = true
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-
-const handleBack = () => {
-  history.back()
-}
-const handleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.originalFileName}的表格吗?`, '系统提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteFile(row.fileId).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success("删除成功");
-        formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
-      }
-    });
-  }).catch(() => {
-    ElMessage.warning("用户取消删除! ");
-  })
-}
-
-onMounted(async () => {
-  loading.value = true
-  await init()
-  if (route.query.id) {
-    await getDetailInfo()
-  }
-  loading.value = false
-})
-</script>
-
-<style lang="scss" scoped>
-:deep(.el-empty__description) {
-  margin-top: 0;
-}
-
-.add-block {
-  //display: flex;
-  //justify-content: space-between;
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  a {
-    cursor: pointer;
-    font-size: 14px;
-    color: #2a99ff;
-  }
-
-  .approval-record {
-    position: relative;
-  }
-}
-</style>
diff --git a/src/views/project-demand/collection/detail.vue b/src/views/project-demand/collection/detail.vue
deleted file mode 100644
index c59a55c..0000000
--- a/src/views/project-demand/collection/detail.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-  <div class="detail-block" v-loading="loading">
-    <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
-      <baseTitle title="需求征集详情"></baseTitle>
-      <el-row>
-        <el-col :span="12" v-if="checkFormPrem('requirementName')">
-          <el-form-item label="名称">
-            <span>{{ formData.requirementName }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="checkFormPrem('companyIds')">
-          <el-form-item label="所属公司">
-            <span>{{ formData.companyIds }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="checkFormPrem('collectType')">
-          <el-form-item label="征集类型">
-            <span>{{ formData.collectType }}</span>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="checkFormPrem('deadline')">
-          <el-form-item label="截止时间">
-            <span>{{ formData.deadline }}</span>
-          </el-form-item>
-        </el-col>
-        <baseTitle title="征集说明"></baseTitle>
-        <el-col :span="24" v-if="checkFormPrem('collectExplain')">
-          <el-form-item>
-            <el-card style="width: 100%">
-              <div v-html="formData.collectExplain">
-              </div>
-            </el-card>
-          </el-form-item>
-        </el-col>
-        <baseTitle title="附件列表"></baseTitle>
-        <el-col :span="24" v-if="checkFormPrem('collectExplain')">
-          <el-form-item>
-            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
-                     :data="formData.fileList" :isSettingCol="false" :pagination="false">
-              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-              </template>
-            </fvTable>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <div v-if="processInstanceData.taskId">
-            <baseTitle title="审核意见"></baseTitle>
-            <el-form-item prop="auditOpinion">
-              <el-input
-                  v-model="formData.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="processDiagramViewer" :operation-list="processInstanceData.operationList"
-                            :state="processInstanceData.state"/>
-          <process-diagram-viewer v-if="processDiagramViewer"/>
-        </div>
-      </div>
-    </el-form>
-    <div class="oper-page-btn" v-if="processInstanceData.state === '1' && processInstanceData.taskId">
-      <el-button @click="handleReject(demandForm)">驳回</el-button>
-      <el-button color="#DED0B2" @click="handleSubmit">同意</el-button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="jsx">
-import OperationRender from '@/views/workflow/common/OperationRender.vue'
-import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
-import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo, agreeTask, rejectTask, downloadFile} from "@/api/project-demand/index.js";
-import {getSubCompOpt} from '@/api/user/user.js'
-import {ElMessage} from "element-plus";
-import {useTagsView} from '@/stores/tagsview.js'
-import {matterTree} from '@/utils/matterTree.js';
-
-const tagsViewStore = useTagsView()
-const router = useRouter()
-const route = useRoute()
-const form = ref();
-const loading = ref(false)
-const demandForm = ref()
-const processStore = useProcessStore()
-const companyOption = ref([])
-const formPermMap = ref(new Map());
-const processInstanceData = ref({})
-const showTable = ref(false)
-const processDiagramViewer = ref(false)
-const processTree = ref()
-const companyNameArray = ref([])
-const formData = ref({})
-const rules = reactive({
-  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
-})
-const tableConfig = reactive({
-  columns: [
-    {
-      prop: 'index',
-      type: 'index',
-      label: '序号',
-      align: 'center',
-      width: '80',
-    },
-    {
-      prop: 'originalFileName',
-      label: '文件名',
-      align: 'center',
-    },
-    {
-      prop: 'tag',
-      label: '标签',
-      align: 'center'
-    },
-    {
-      prop: 'size',
-      label: '文件大小',
-      align: 'center',
-      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      currentRender: ({row, index}) => {
-        return (
-            <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
-        )
-      }
-    }
-  ]
-})
-
-const checkFormPrem = (formKey) => {
-  if (formPermMap.value.hasOwnProperty(formKey)) {
-    let formItem = formPermMap.value[formKey];
-    return formItem.perm === 'READ'
-  } else {
-    return true;
-  }
-}
-
-
-const fromPrem = (formKey) => {
-  let formItem = formPermMap.value[formKey];
-  return formItem.perm
-}
-
-const handleSubmit = () => {
-  let approve = {
-    taskId: processInstanceData.value.taskId,
-    auditOpinion: formData.value.auditOpinion,
-    formData: formData.value
-  }
-  agreeTask(approve).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-      router.push({
-        name: 'Requirement'
-      })
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleReject = (instance) => {
-  if (!instance) return
-  instance.validate(async (valid) => {
-    if (!valid) return
-    let approve = {
-      taskId: processInstanceData.value.taskId,
-      auditOpinion: formData.value.auditOpinion,
-    }
-    rejectTask(approve).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        tagsViewStore.delVisitedViews(router.currentRoute.value.path)
-        router.push({
-          name: 'Requirement'
-        })
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  })
-}
-const getCompanyOption = async () => {
-  const res = await getSubCompOpt()
-  companyOption.value = res.data
-}
-
-const getDataSourceOptionItem = (val) => {
-  if (val !== undefined) {
-    val.forEach(item => {
-      matterTree(companyNameArray.value, companyOption.value, item)
-    })
-  }
-  return companyNameArray.value.join('，');
-}
-
-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 init = async () => {
-  if (!route.query.id) return;
-  await getCompanyOption()
-  getInfo(route.query.id).then(res => {
-    loading.value = false
-    let data = res.data
-    formData.value = data.formData;
-    data.formData.companyIds = getDataSourceOptionItem(data.formData.companyIds)
-    processInstanceData.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(() => {
-      processDiagramViewer.value = true
-      showTable.value = true
-    })
-  })
-}
-onMounted(async () => {
-  loading.value = true
-  await init()
-})
-</script>
-
-<style lang="scss" scoped>
-:deep(.el-empty__description) {
-  margin-top: 0;
-}
-
-.detail-block {
-  overflow: hidden;
-  padding-right: 10px;
-
-  .info {
-    display: flex;
-    flex-wrap: wrap;
-
-    > div {
-      width: 350px;
-      margin-bottom: 15px;
-      margin-right: 10px;
-
-      > span:first-child {
-        color: black;
-        font-size: 16px;
-        font-weight: bold;
-      }
-    }
-  }
-
-  .approval-record {
-    padding-bottom: 30px;
-
-    .process {
-      position: relative;
-    }
-  }
-}
-
-</style>
diff --git a/src/views/project-demand/collection/index.vue b/src/views/project-demand/collection/index.vue
deleted file mode 100644
index 002de02..0000000
--- a/src/views/project-demand/collection/index.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
-    <template #empty>
-      <el-empty description="暂无数据"/>
-    </template>
-  </fvTable>
-</template>
-
-<script setup lang="jsx">
-import {useAuthStore} from '@/stores/userstore.js'
-import Tag from '@/components/Tag.vue'
-import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {ElMessage} from "element-plus";
-import {deleteDemand} from "@/api/project-demand";
-
-const authStore = useAuthStore()
-const router = useRouter()
-const searchConfig = reactive([
-  {
-    label: '需求名称',
-    prop: 'requirementName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入名称查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
-  {
-    label: '征集类型',
-    prop: 'collectType',
-    component: shallowRef(fvSelect),
-    props: {
-      placeholder: '请选择征集类型',
-      clearable: true,
-      filterable: true,
-      cacheKey: 'todo_type'
-    }
-  }
-])
-const tableIns = ref()
-const userInfo = ref(authStore.userinfo)
-const tableConfig = reactive({
-  columns: [
-    {
-      type: 'selection',
-      prop: 'selection'
-    },
-    {
-      prop: 'requirementName',
-      label: '需求名称',
-      align: 'center'
-    },
-    {
-      prop: 'collectType',
-      label: '征集类型',
-      align: 'center'
-    },
-    {
-      prop: 'companyName',
-      label: '所属公司',
-      align: 'center',
-      currentRender: ({row, index}) => (
-          <div style={{width: '300px', textOverflow: 'ellipsis'}}>{row.companyName}</div>)
-    },
-    {
-      prop: 'approveName',
-      label: '审批人',
-      align: 'center'
-    },
-    {
-      prop: 'deadline',
-      label: '截止时间',
-      align: 'center'
-    },
-    {
-      prop: 'taskNode',
-      label: '当前节点',
-      align: 'center'
-    },
-    {
-      prop: 'state',
-      label: '状态',
-      align: 'center',
-      width: 200,
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
-    },
-    {
-      prop: 'oper',
-      label: '操作',
-      align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        let btn = []
-        let buttons = new Set(Array.from(row.buttons))
-        if (buttons.has("details")) {
-          btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
-        }
-        if (buttons.has("edit")) {
-          btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
-        }
-        // if (buttons.has("delete")) {
-        //   btn.push({label: '删除',prem: ['mosr:requirement:del'], func: () => handleDelete(row), type: 'primary'})
-        // }
-        if (buttons.has("report")) {
-          btn.push({label: '需求上报',prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        }
-        return (
-            <div style={{width: '100%'}}>
-              {
-                btn.map(item => (
-                    <el-button
-                        type={item.type}
-                        v-perm={item.prem}
-                        onClick={() => item.func()}
-                        link
-                    >
-                      {item.label}
-                    </el-button>
-                ))
-              }
-              {
-                buttons.has("delete") ?
-                    <popover-delete name={row.requirementName} type={'需求征集'} btnType={'danger'} perm={['mosr:requirement:del']}
-                                    onDelete={() => handleDelete(row)}/> : ''
-              }
-            </div>
-        )
-      }
-    }
-  ],
-  api: '/workflow/mosr/requirement',
-  btns: [
-    {name: '新增', key: 'add', color: '#DED0B2'},
-    {name: '导出', key: 'export', type: ''},
-  ],
-  params: {}
-})
-
-console.log('userInfo', userInfo.value.userName)
-
-const search = (val) => {
-  tableConfig.params = {...val}
-  tableIns.value.refresh()
-}
-const handleAdd = () => {
-  //新增
-  router.push({
-    name: 'Requirement/edit',
-    query: {
-      isAdd: 1
-    }
-  })
-}
-const handleEdit = (row) => {
-  router.push({
-    name: 'Requirement/edit',
-    query: {
-      id: row.requirementId
-    }
-  })
-}
-const handleDelete = (row) => {
-  deleteDemand(row.requirementId).then(res => {
-    if (res.code === 1000) {
-      ElMessage.success(res.msg)
-      tableIns.value.refresh()
-    } else {
-      ElMessage.error(res.msg)
-    }
-  })
-}
-const handleDetail = (row) => {
-  router.push({
-    name: 'Requirement/detail',
-    query: {
-      id: row.requirementId
-    }
-  })
-}
-const handleReport = (row) => {
-  router.push({
-    name: 'Summary/add',
-    query: {
-      id:row.requirementId
-    }
-  })
-}
-const headBtnClick = (key) => {
-  switch (key) {
-    case 'add':
-      handleAdd()
-      break;
-    case 'export':
-      handleExport()
-      break;
-  }
-}
-</script>
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 518d90b..3ebeb0d 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'1'" @setDetail="setDetail" @stepChange="stepChange">
+  <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"/>
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
index 31a7898..64ad1b8 100644
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'4'" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="4" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
           :formData="commonForm.formData"
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 806359d..89e14cf 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'3'" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="3" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
         :formData="commonForm.formData"
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index ff63110..da778ab 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'2'" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="2" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
         :formData="commonForm.formData"
diff --git a/vite.config.js b/vite.config.js
index b418a81..fc3db23 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -31,7 +31,7 @@ export default defineConfig({
       resolvers: [
         // 自动注册图标组件
         IconsResolver({
-          enabledCollections: ['ep'],
+          enabledRequirements: ['ep'],
         }),
         //自动导入组件
         ElementPlusResolver()
@@ -68,20 +68,20 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
-      '/api/workflow': {
-        // 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/admin': {
-        // 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/workflow': {
+      //   // 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/admin': {
+      //   // 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://mosr.feashow.cn',
         changeOrigin: true,

From e71c142ea93be51e834adc62a98aaedd833c36c9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 27 May 2024 21:16:14 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                      | 42 +++++++++++++++++--
 src/views/project-demand/requirement/add.vue  |  7 ++--
 .../project-demand/requirement/index.vue      |  8 ++--
 src/views/project-demand/summary/detail.vue   |  1 +
 src/views/project-demand/summary/index.vue    |  6 +--
 .../project-management/filing/detail.vue      |  1 +
 .../implementation/detail.vue                 |  1 +
 .../implementation/index.vue                  |  2 +-
 .../project-management/initiation/detail.vue  |  1 +
 9 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 446106a..b4b96c7 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -115,7 +115,7 @@ const tableConfig = reactive({
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if(row.targetState!==null){
+        if(row.targetState!==null||row.targetState!==undefined){
           return (<Tag dictType={'todo_type'} value={row.targetState}/>)
         }else {
           return '--'
@@ -153,8 +153,7 @@ const tableConfig = reactive({
   params: {},
 })
 const handleView = (row) => {
-  console.log('row', row)
-  if(row.targetState=='00'&&row.targetId){
+  if (row.targetState == '00' && row.targetId) {
     router.push({
       name: 'Requirement/detail',
       query: {
@@ -162,6 +161,43 @@ const handleView = (row) => {
       }
     })
   }
+  else if(row.targetState=='10'&&row.targetId){
+    router.push({
+      name: 'Summary/detail',
+      query: {
+        id: row.targetId,
+        projectId: row.projectId,
+        state: row.state
+      }
+    })
+  }else if(row.targetState=='20'&&row.targetId){
+    router.push({
+      name: 'Initiation/detail',
+      query: {
+        id: row.targetId,
+        projectId: row.projectId,
+        state: row.state
+      }
+    })
+  }else if(row.targetState=='40'&&row.targetId){
+    router.push({
+      name: 'Implementation/detail',
+      query: {
+        id: row.targetId,
+        projectId: row.projectId,
+        state: row.state
+      }
+    })
+  }else if(row.targetState=='50'&&row.targetId){
+    router.push({
+      name: 'Filing/detail',
+      query: {
+        id: row.targetId,
+        projectId: row.projectId,
+        state: row.state
+      }
+    })
+  }
 }
 </script>
 
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index e9f863b..caa2ec4 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -176,10 +176,11 @@ const handleDownload = (row) => {
   })
 }
 const compositeParam = (item) => {
+  console.log('router.currentRoute.value.path',router.currentRoute.value.path)
   let tag = ''
-  if (!formData.value.collectType && router.currentRoute.value.name === 'Requirement/add') {
-    tag = '需求征集'
-  }
+  // if (!formData.value.collectType && router.currentRoute.value.path === 'Requirement/add') {
+  //   tag = '需求征集'
+  // }
   return {
     fileId: item.id,
     size: item.size,
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index da2c3b3..ba4e8de 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -149,7 +149,7 @@ const search = (val) => {
 const handleAdd = () => {
   //新增
   router.push({
-    name: 'Requirement/add',
+    name:'Requirement/add',
     query: {
       isAdd: 1
     }
@@ -157,7 +157,7 @@ const handleAdd = () => {
 }
 const handleEdit = (row) => {
   router.push({
-    name: 'Requirement/edit',
+    name:'Requirement/edit',
     query: {
       id: row.requirementId
     }
@@ -175,7 +175,7 @@ const handleDelete = (row) => {
 }
 const handleDetail = (row) => {
   router.push({
-    name: 'Detail',
+    name:'Requirement/detail',
     query: {
       id: row.requirementId
     }
@@ -183,7 +183,7 @@ const handleDetail = (row) => {
 }
 const handleReport = (row) => {
   router.push({
-    name: 'Summary/add',
+    name:'Summary/add',
     query: {
       id:row.requirementId
     }
diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 3ebeb0d..c7c9e87 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -49,6 +49,7 @@ const getInfo = async (state) => {
     message: msg,
     type: code === 1000 ? 'success' : 'error'
   })
+  if(data===undefined)return;
   if(code===1000){
     summaryData.value = data;
     loading.value = false
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 04a6db5..fad2ccc 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -175,7 +175,7 @@ const search = (val) => {
 
 const handleAdd = (row) => {
   router.push({
-    name: 'Summary/add',
+    name:'Summary/add',
     query: {
       id:row.requirementId
     }
@@ -183,7 +183,7 @@ const handleAdd = (row) => {
 }
 const handleEdit = (row) => {
   router.push({
-    name: 'Summary/edit',
+    name:'Summary/edit',
     query: {
       id:row.requirementId,
       projectId:row.projectId
@@ -192,7 +192,7 @@ const handleEdit = (row) => {
 }
 const handleDetail = (row) => {
   router.push({
-    name: 'Summary/detail',
+    name:'Summary/detail',
     query: {
       id:row.requirementId,
       projectId: row.projectId,
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
index 64ad1b8..b7f1460 100644
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -71,6 +71,7 @@ const getAllInfo = async (state) => {
     if(code===1000){
       loading.value = false
     }
+    if(data===undefined)return;
     commonForm.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 89e14cf..cec836a 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -76,6 +76,7 @@ const getAllInfo = async (state) => {
     if(code===1000){
       loading.value = false
     }
+    if(data===undefined)return;
     commonForm.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index c7128f9..f5bd960 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -216,7 +216,7 @@ const search = (val) => {
 
 const handleDetail = (row) => {
   router.push({
-    name: 'Implementation/detail',
+    name:'Implementation/detail',
     query: {
       id: row.requirementId,
       projectId: row.projectId,
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index da778ab..e6b9776 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -117,6 +117,7 @@ const getAllInfo = async (state) => {
       loading.value = false
     }
     console.log(data, 'data--22');
+    if(data===undefined)return;
     commonForm.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;