From 7e07010f0ddb3a5b5b9421b492c614bca726d032 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 21:39:37 +0800
Subject: [PATCH 01/18] =?UTF-8?q?fix=20:=20=E5=8F=B0=E8=B4=A6=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=9B=B4=E6=96=B0=E8=BE=93=E5=85=A5=E6=A1=86=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/implementation/updateTable.vue  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/project-management/implementation/updateTable.vue b/src/views/project-management/implementation/updateTable.vue
index b27a60e..3908e1c 100644
--- a/src/views/project-management/implementation/updateTable.vue
+++ b/src/views/project-management/implementation/updateTable.vue
@@ -3,12 +3,12 @@
   <el-form :model="tableForm" ref="form">
     <el-row>
       <el-col :span="24">
-        <el-form-item prop="projectName" label="项目名称">
+        <el-form-item prop="projectName" label="项目名称" label-width="150">
           <span>{{ tableForm.projectName }}</span>
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item prop="projectChargePerson" label="项目负责人">
+        <el-form-item prop="projectChargePerson" label="项目负责人"  label-width="150">
           <el-button color="#DED0B2" @click="showPersonnelPicker" style="margin-right: 10px">
             {{ tableForm.projectChargePersonName ? '更改' : '请选择项目负责人' }}
           </el-button>
@@ -16,7 +16,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item prop="startTime" label="项目开始时间">
+        <el-form-item prop="startTime" label="项目开始时间" label-width="150">
           <el-date-picker
               v-model="tableForm.startTime"
               type="date"
@@ -42,13 +42,13 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item prop="projectDevelopmentWay" label="项目开展方式" style="width: 100%">
+        <el-form-item prop="projectDevelopmentWay" label="项目开展方式" style="width: 100%" label-width="150">
           <el-input v-model="tableForm.projectDevelopmentWay" placeholder="请输入项目开展方式" clearable>
           </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item prop="projectBudgetDescription" label="项目预算" style="width: 100%">
+        <el-form-item prop="projectBudgetDescription" label="项目预算" style="width: 100%"  label-width="150">
           <el-input v-model="tableForm.projectBudgetDescription" placeholder="请输入项目预算" clearable>
           </el-input>
         </el-form-item>

From e5777b55bcbbd388bc96d493dfefffd65e6c2654 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 22:37:51 +0800
Subject: [PATCH 02/18] =?UTF-8?q?fix=20:=20=E5=B9=B4=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/SummaryDetail.vue |  2 +-
 src/views/plan/index.vue                         |  3 ++-
 src/views/project-demand/summary/index.vue       | 11 ++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index ec1368a..7e87e27 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -181,7 +181,7 @@
       </div>
     </el-form>
 
-    <div class="oper-page-btn" v-if="data.state==='5'">
+    <div class="oper-page-btn" v-perm="['annual:plan:approve']" v-if="data.state==='5'">
       <el-button type="danger" @click="handleRejectPlan">驳回年度计划</el-button>
       <el-button color="#DED0B2" @click="handleAgreePlan">通过年度计划</el-button>
     </div>
diff --git a/src/views/plan/index.vue b/src/views/plan/index.vue
index 4718f5c..c93c83e 100644
--- a/src/views/plan/index.vue
+++ b/src/views/plan/index.vue
@@ -1,6 +1,7 @@
 <template>
+  <baseTitle title="年度计划"></baseTitle>
   <!--  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>-->
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" ></fvTable>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index d4a2fce..8872161 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -146,6 +146,7 @@ const auths = {
   edit: ['mosr:collect:resubmit'],
   detail: ['mosr:collect:info'],
   report: ['mosr:collect:reported'],
+  planAdd: ['annual:plan:add'],
 }
 const tableConfig = reactive({
   columns: [
@@ -269,7 +270,7 @@ const tableConfig = reactive({
   params: {},
   btns: [
     {name: '新增上报', key: 'add', color: '#DED0B2', auth: auths.report},
-    {name: '创建年度计划', key: 'export', color: '#DED0B2', auth: ''},
+    {name: '创建年度计划', key: 'export', color: '#DED0B2', auth: auths.planAdd},
     // {name: '经费预算生成', key: 'preMonty', auth: ''},
   ]
 })
@@ -298,7 +299,6 @@ const selectionChange = (data) => {
   projectSelectList.value = data
 }
 const handleExport = () => {
-  console.log('projectSelectList.value', projectSelectList.value)
   let projectIds = []
   projectSelectList.value.map(item => {
     projectIds.push(item.projectId)
@@ -309,7 +309,12 @@ const handleExport = () => {
     }
     addPlan(params).then(res => {
       if (res.code === 1000) {
-
+        router.push({
+          name: 'Plan/detail',
+          query: {
+            id: res.data
+          }
+        })
       }
     })
   }

From 06524178c72a53834f358f9e74529e7829db5362 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 22:38:31 +0800
Subject: [PATCH 03/18] =?UTF-8?q?fix=20:=20=E5=B9=B4=E5=BA=A6=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 8872161..3b8c7b1 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -312,7 +312,7 @@ const handleExport = () => {
         router.push({
           name: 'Plan/detail',
           query: {
-            id: res.data
+            annualPlanId: res.data
           }
         })
       }

From edec70ebbb335faa2188dc70719a57d98e5c5166 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 23:08:36 +0800
Subject: [PATCH 04/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue                    | 2 +-
 src/components/DetailComponent/FileComponent.vue       | 2 +-
 src/views/project-management/implementation/upload.vue | 2 +-
 src/views/special-fund/add.vue                         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 70bb806..6d4f122 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -344,7 +344,7 @@ const deleteSingleFile = (row, type) => {
         if (type === 1) {
           singleFile.value = null
         } else {
-          props.otherFileList.splice(props.otherFileList.findIndex((item) => item.id === row.fileId), 1);
+          props.otherFileList.splice(props.otherFileList.findIndex((item) => item.fileId === row.fileId), 1);
         }
       }
     });
diff --git a/src/components/DetailComponent/FileComponent.vue b/src/components/DetailComponent/FileComponent.vue
index cb8d671..04299b3 100644
--- a/src/components/DetailComponent/FileComponent.vue
+++ b/src/components/DetailComponent/FileComponent.vue
@@ -152,7 +152,7 @@ const handleDelete = (row) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      _value.value.splice(_value.value.findIndex((item) => item.id === row.fileId), 1);
+      _value.value.splice(_value.value.findIndex((item) => item.fileId === row.fileId), 1);
     }
   });
 }
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index ba3c132..909e4e1 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -139,7 +139,7 @@ const handleDelete = (row) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      fileList.value.splice(fileList.value.findIndex((item) => item.id === row.fileId), 1);
+      fileList.value.splice(fileList.value.findIndex((item) => item.fileId === row.fileId), 1);
     }
   });
 }
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index b37cd65..5cbe558 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -135,8 +135,8 @@ const handleDelete = (row) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      formData.value.files.splice(formData.value.files.findIndex((item) => item.id === row.fileId), 1);
-      showTable.value = formData.value.files.length !== 0;
+      formData.value.files.splice(formData.value.files.findIndex((item) => item.fileId === row.fileId), 1);
+      // showTable.value = formData.value.files.length !== 0;
     }
   });
 }

From 3c564b600b9cebb3cf1e776e798494f754b19d47 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 23:10:45 +0800
Subject: [PATCH 05/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index ea15fa1..4c3874a 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -457,7 +457,7 @@ const handleDelete = (row) => {
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.id === row.fileId), 1);
+      formData.value.fileList.splice(formData.value.fileList.findIndex((item) => item.fileId === row.fileId), 1);
       // showTable.value = formData.value.fileList.length !== 0;
     }
   });

From 57776764f8235b49d7ac65acf2a1bb351bd78013 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 6 Jul 2024 23:29:33 +0800
Subject: [PATCH 06/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E5=85=AC=E5=8F=B8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/requirement/add.vue | 30 +++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 4c3874a..3e1cd64 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -104,6 +104,7 @@
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
+
     <company-picker :multiple="true" ref="companyRef" title="请选择征集公司" @ok="selected"
                     v-model:value="selectedCompanyList"/>
   </div>
@@ -128,7 +129,6 @@ import {getSubCompOpt} from '@/api/user/user.js'
 import {useTagsView} from '@/stores/tagsview.js'
 import {getFundOption} from "@/api/special-fund";
 import CompanyPicker from "@/components/DetailComponent/CompanyPicker.vue";
-import {matterTree} from "@/utils/matterTree";
 
 import {useCacheStore} from '@/stores/cache.js'
 
@@ -408,22 +408,30 @@ const handleResubmit = () => {
     }
   })
 }
-
+const matterTree = (array,data, id) => {
+  if (id) {
+    data.forEach(item => {
+      if (item.value == id) {
+        let obj={
+          label:item.label,
+          value:item.value
+        }
+        array.push(obj);
+      }
+      if (item.children && item.children.length > 0) {
+        matterTree(array,item.children,id)
+      }
+    })
+    return array;
+  }
+}
 const getCompanyOptionItem = (val) => {
-  let newObj = {}
-  let newArray = []
   if (val !== undefined) {
     val.forEach(item => {
       matterTree(companyNameArray.value, companyOption.value, item)
     })
-    companyNameArray.value.forEach(companyItem => {
-      newObj = {
-        label: companyItem
-      }
-      newArray.push(newObj)
-    })
   }
-  return newArray;
+  return companyNameArray.value;
 }
 const getDetailInfo = async () => {
   getFormInfo(route.query.id).then(res => {

From 8feef06c119c8ebc4f7dc131df2592a6fc068d36 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 00:05:47 +0800
Subject: [PATCH 07/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E9=A2=84=E6=9C=9F=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/add.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 57b0d08..bf76f2a 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -415,14 +415,6 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
-    let params = {
-      ...formData.value,
-      deploymentId: deploymentId.value,
-      fileList: otherFiles,
-      requirementId: route.query.id ? route.query.id : '-1'
-    }
-    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -432,8 +424,17 @@ const handleSubmit = debounce(async (instance) => {
       })
       return;
     } else {
+      formData.value.resultForm=JSON.stringify(formData.value.resultForm)
       attachment.value.clearValidate()
     }
+    let params = {
+      ...formData.value,
+      deploymentId: deploymentId.value,
+      fileList: otherFiles,
+      requirementId: route.query.id ? route.query.id : '-1'
+    }
+    console.log('params', params)
+
     let res = await requirementReported(params)
     ElNotification({
       title: '提示',
@@ -464,12 +465,12 @@ const handleResubmit = debounce(() => {
     })
     return;
   } else {
+    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     attachment.value.clearValidate()
   }
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,

From a5864a32ce16d37987eb5ace40562fba9e6e6879 Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sun, 7 Jul 2024 00:45:16 +0800
Subject: [PATCH 08/18] =?UTF-8?q?feat=EF=BC=9A=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=9D=99=E6=80=81=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index 751d995..3e3f3cb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -145,6 +145,46 @@ const router = createRouter({
                         breadcrumb: false
                     }
                 },
+                // 项目详情
+                {
+                    path: '/project/management/implementation/implementation/detail',
+                    name: 'Implementation/detail',
+                    component: () => import('@/views/project-management/implementation/detail.vue'),
+                    meta: {
+                        title: '项目详情',
+                        breadcrumb: false
+                    }
+                },
+                // 需求征集详情
+                {
+                    path: '/project/demand/requirement/requirement/detail',
+                    name: 'Requirement/detail',
+                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    meta: {
+                        title: '需求征集-详情',
+                        breadcrumb: false
+                    }
+                },
+                // 专项资金详情
+                {
+                    path: '/special/fund/fund/detail',
+                    name: 'Fund/detail',
+                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    meta: {
+                        title: '专项资金-详情',
+                        breadcrumb: false
+                    }
+                },
+                // 费用分摊详情
+                {
+                    path: '/expense/management/expense/share/share/detail',
+                    name: 'Share/detail',
+                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    meta: {
+                        title: '费用分摊-详情',
+                        breadcrumb: false
+                    }
+                },
             ]
         },
         {

From 2a25942cdf80bd20cab492e52b083fe1dfcd03c1 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 00:46:19 +0800
Subject: [PATCH 09/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E4=B8=8A=E6=8A=A5=E9=A2=84=E6=9C=9F=E6=88=90=E6=9E=9C?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/SummaryDetail.vue | 4 ++--
 src/views/project-demand/summary/add.vue         | 8 ++++----
 src/views/project-demand/summary/index.vue       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 7e87e27..4d9b23f 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -292,8 +292,8 @@ const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
   let result = []
-  if (JSON.parse(value) instanceof Array) {
-    JSON.parse(value).forEach(item1 => {
+  if (value instanceof Array) {
+    value.forEach(item1 => {
       data.find(item => {
         if (item.value == item1) {
           result.push(item.label)
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index bf76f2a..0e29d7d 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -424,7 +424,7 @@ const handleSubmit = debounce(async (instance) => {
       })
       return;
     } else {
-      formData.value.resultForm=JSON.stringify(formData.value.resultForm)
+      // formData.value.resultForm=JSON.stringify(formData.value.resultForm)
       attachment.value.clearValidate()
     }
     let params = {
@@ -465,7 +465,7 @@ const handleResubmit = debounce(() => {
     })
     return;
   } else {
-    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
+    // formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     attachment.value.clearValidate()
   }
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
@@ -475,7 +475,7 @@ const handleResubmit = debounce(() => {
     ...formData.value,
     deploymentId: deploymentId.value,
     fileList: otherFiles,
-    requirementId: route.query.requirementId ? route.query.requirementId : '-1'
+    requirementId: route.query.id ? route.query.id : '-1'
   }
   // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId)
   resubmitReported(params).then(res => {
@@ -503,7 +503,7 @@ const getDetailInfo = async () => {
     })
     if (res.code === 1000) {
       res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId
-      res.data.formData.resultForm = JSON.parse(res.data.formData.resultForm)
+      // res.data.formData.resultForm = JSON.parse(res.data.formData.resultForm)
       formData.value = res.data.formData
       loading.value = false
     }
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 3b8c7b1..a1d1c4d 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -342,7 +342,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      requirementId: row.requirementId,
+      id: row.requirementId,
       projectId: row.projectId
     }
   })

From 9b19de0ff9b7d5fcc70652d862363edc2d829a04 Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Sun, 7 Jul 2024 00:56:20 +0800
Subject: [PATCH 10/18] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=B1=87=E6=80=BB=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index 3e3f3cb..6eb2f77 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -165,6 +165,16 @@ const router = createRouter({
                         breadcrumb: false
                     }
                 },
+                // 需求汇总详情
+                {
+                    path: '/project/demand/summary/summary/detail',
+                    name: 'Summary/detail',
+                    component: () => import('@/views/project-demand/summary/detail.vue'),
+                    meta: {
+                        title: '需求汇总-详情',
+                        breadcrumb: false
+                    }
+                },
                 // 专项资金详情
                 {
                     path: '/special/fund/fund/detail',

From b21719aaa0d92d889d57dcc4ed1bbfa66ef5f2c6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 02:22:17 +0800
Subject: [PATCH 11/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=8F=8A=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=90=8E=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/SummaryDetail.vue         |  6 ++
 src/router/index.js                           |  4 +-
 .../implementation/account.vue                | 55 ++++++-------------
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 4d9b23f..99ba5bc 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -272,6 +272,9 @@ const handleRejectPlan = async () => {
     type: res.code === 1000 ? 'success' : 'error'
   })
   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
 }
 const handleAgreePlan = async () => {
   const params = {
@@ -287,6 +290,9 @@ const handleAgreePlan = async () => {
     type: res.code === 1000 ? 'success' : 'error'
   })
   tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+  router.push({
+    name: 'Summary'
+  })
 }
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
diff --git a/src/router/index.js b/src/router/index.js
index 6eb2f77..b9ead7c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -179,7 +179,7 @@ const router = createRouter({
                 {
                     path: '/special/fund/fund/detail',
                     name: 'Fund/detail',
-                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    component: () => import('@/views/special-fund/detail.vue'),
                     meta: {
                         title: '专项资金-详情',
                         breadcrumb: false
@@ -189,7 +189,7 @@ const router = createRouter({
                 {
                     path: '/expense/management/expense/share/share/detail',
                     name: 'Share/detail',
-                    component: () => import('@/views/project-demand/requirement/detail.vue'),
+                    component: () => import('@/views/expense-management/share/detail.vue'),
                     meta: {
                         title: '费用分摊-详情',
                         breadcrumb: false
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 3a92081..329d91f 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -1,6 +1,20 @@
 <template>
   <view style="overflow-y: scroll">
     <baseTitle title="基础信息"></baseTitle>
+    <el-form :model="basicData">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item prop="requirementName" label="征集名称" label-width="122">
+            <span>{{basicData.requirementName}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="projectName" label="项目名称" label-width="130">
+            <span>{{basicData.projectName}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
     <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
     <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" @selectionChange="selectionChange">
@@ -20,37 +34,9 @@ import {searchUpdateLedgerData,exportExcel} from "@/api/project-manage";
 
 const router = useRouter()
 const route = useRoute()
-const formArray = ref([
-  {
-    label: '征集名称',
-    prop: 'requirementName',
-    colProps: {
-      span: 12
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
-    colProps: {
-      span: 12
-    }
-  }
-])
+const basicData=ref({})
+const tableData = ref({})
 const formDataArray = ref([
-  {
-    label: '征集名称',
-    prop: 'requirementName',
-    colProps: {
-      span: 8
-    }
-  },
-  {
-    label: '项目名称',
-    prop: 'projectName',
-    colProps: {
-      span: 8
-    }
-  },
   {
     label: '项目负责人',
     prop: 'projectChargePersonName',
@@ -102,13 +88,8 @@ const formDataArray = ref([
     }
   }
 ])
-const tableData = ref({})
 const schema = computed(() => {
-  // if (JSON.stringify(tableData.value) !== '{}') {
     return formDataArray.value
-  // } else {
-  //   return formArray.value
-  // }
 })
 const baseForm = ref()
 const tableIns = ref()
@@ -259,8 +240,7 @@ const handleUpdateTable = () => {
 const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.id)
-    baseForm.value.setValues(data)
-    await init()
+    basicData.value=data
   } catch {
   }
 }
@@ -279,6 +259,7 @@ const init = async () => {
   // }
 }
 getBaseInfo()
+init()
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':

From fce1bfdb6fd4ddb50a1ce3246db8e957c4824179 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 02:36:40 +0800
Subject: [PATCH 12/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/detail.vue | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 6aaeb41..7d0842c 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -4,9 +4,12 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="年度计划名称" prop="annualPlanName">
-            <!--            <el-input v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>-->
-            <!--            </el-input>-->
-            <span>{{ formData.annualPlanName }}</span>
+            <div v-if="isEdit">
+              <el-input  v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
+              </el-input>
+              <el-button color="#DED0B2" style="margin-left: 10px" @click="editName">提交</el-button>
+            </div>
+            <span v-else>{{ formData.annualPlanName }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -18,6 +21,7 @@
     </el-form>
     <div class="query-btn">
       <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
+      <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0" @click="editBtn">编辑</el-button>
     </div>
     <el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}">
       <el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center">
@@ -124,7 +128,7 @@
 <script setup>
 import {toThousands} from '@/utils/changePrice.js'
 import {ElNotification} from "element-plus";
-import {getPlan} from "@/api/project-demand/summary";
+import {getPlan,editPlan} from "@/api/project-demand/summary";
 import {useCacheStore} from '@/stores/cache.js'
 import {exportExcel} from "@/utils/export-excel";
 
@@ -133,6 +137,7 @@ const loading = ref(false)
 const formData = ref({})
 const table = ref()
 const route = useRoute()
+const isEdit = ref(false)
 const exportTable = () => {
   const $e = table.value.$el
   let $table = $e.querySelector('.el-table__fixed')
@@ -141,12 +146,31 @@ const exportTable = () => {
   }
   exportExcel($table, (5 + (Object.keys(formData.value.projectList[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表", 2)
 }
+const editName=()=>{
+  let param={
+    annualPlanId:route.query.annualPlanId,
+    annualPlanName:formData.value.annualPlanName
+  }
+  editPlan(param).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      isEdit.value=false
+    }
+  })
+}
+const editBtn = () => {
+  isEdit.value=true
+}
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
   let result = []
-  if (JSON.parse(value) instanceof Array) {
-    JSON.parse(value).forEach(item1 => {
+  if (value instanceof Array) {
+    value.forEach(item1 => {
       data.find(item => {
         if (item.value == item1) {
           result.push(item.label)

From 06090fc00b438882e92951dd4ef3d26c9df1622e Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 02:43:40 +0800
Subject: [PATCH 13/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E5=8F=B0=E8=B4=A6=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/ledger/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index bda800a..9b39330 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -31,7 +31,9 @@ const searchConfig = reactive([
     props: {
       placeholder: '请选择时间',
       clearable: true,
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      type:'month',
+      format: 'YYYY-MM',
+      valueFormat:'YYYY-MM-DD HH:mm:ss',
     },
     colProps: {}
   },

From 09d95babd03bbbe82c0275bc9ea91e21b5cc4c1f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 03:31:18 +0800
Subject: [PATCH 14/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CompanyPicker.vue         | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index 03f8bed..ca11713 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -1,7 +1,6 @@
 <template>
-  <el-dialog custom-class="custom-dialog" class="border" :border="false" closeFree width="1000px" style="height: 676px"
-             :title="title" :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="true"
-             :destroy-on-close="true">
+  <el-dialog custom-class="custom-dialog" class="border" :border="false"  width="1000px" style="height: 676px"
+             :title="title" :show-close="false" :visible.sync="visible" v-model="visible" append-to-body :close-on-click-modal="true" >
     <div class="picker">
       <div class="candidate" v-loading="loading">
         <el-input v-model="filterText" @change="getList()"
@@ -10,7 +9,6 @@
             <el-button @click="getList()">搜索</el-button>
           </template>
         </el-input>
-
         <fvCheckbox style="margin-left: 10px" :options="checkOptions" v-model="checkList" @change="checkBoxChange"/>
         <!-- 人员选择 -->
         <el-empty :image-size="100" description="似乎没有数据" v-show="dataList.length === 0"/>
@@ -68,10 +66,10 @@ const checkOptions = ref([
     label: isExpand.value,
     value: '1'
   },
-  {
-    label: '父子联动',
-    value: '2'
-  },
+  // {
+  //   label: '父子联动',
+  //   value: '2'
+  // },
 ])
 const props = defineProps({
   value: {
@@ -107,13 +105,13 @@ const defaultProps = {
   children: "children",
   disabled: "disabled",
 };
-const emit = defineEmits();
+const emit = defineEmits(['update:modelValue'])
 const _value = computed({
   get() {
     return props.value;
   },
-  set(val) {
-    emit("input", val);
+  set(value) {
+    emit('update:modelValue', value)
   }
 });
 
@@ -157,14 +155,8 @@ const filterNode = (value, data) => {
 const show = () => {
   //用于弹开部门选择
   visible.value = true;
-  // console.log('_value.value', _value.value, selectList.value)
-  // if(selectList.value.length==0){
-  //   selectList.value=[]
-  //   defaultChecked.value =[]
-  // }else {
   selectList.value = _value.value
   defaultChecked.value = _value.value.map(item => item.value)
-  // }
   getList()
 };
 

From 2c8de29fcda52e706f7080018c54dbcb3aca8a46 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 04:12:06 +0800
Subject: [PATCH 15/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3-=E9=99=84=E4=BB=B6=E6=90=9C=E7=B4=A2=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchFilesByTag.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue
index f605219..bb8a55a 100644
--- a/src/components/SearchFilesByTag.vue
+++ b/src/components/SearchFilesByTag.vue
@@ -126,7 +126,7 @@ const handleSearch = () => {
 }
 const handleReset=()=>{
   attachment.fileName=''
-  attachment.tag=''
+  attachment.tag=null
   emit('search', {})
 }
 const handleUpload = () => {

From 23975e056a845071bbfb0bfaea09dbe456a0e96c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 7 Jul 2024 23:36:20 +0800
Subject: [PATCH 16/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=93?=
 =?UTF-8?q?=E9=A1=B9=E8=B5=84=E9=87=91=E6=9D=83=E9=99=90,=20=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8=E5=8F=B0=E8=B4=A6=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/ledger/index.vue | 2 +-
 src/views/special-fund/index.vue              | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/expense-management/ledger/index.vue b/src/views/expense-management/ledger/index.vue
index 9b39330..74034a5 100644
--- a/src/views/expense-management/ledger/index.vue
+++ b/src/views/expense-management/ledger/index.vue
@@ -33,7 +33,7 @@ const searchConfig = reactive([
       clearable: true,
       type:'month',
       format: 'YYYY-MM',
-      valueFormat:'YYYY-MM-DD HH:mm:ss',
+      valueFormat:'YYYY-MM',
     },
     colProps: {}
   },
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index 713a75d..20d2d55 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -123,10 +123,10 @@ const tableConfig = reactive({
         let btn = []
         let buttons = new Set(Array.from(row.buttons))
         if (buttons.has("details")) {
-        btn.push({label: '详情', prem: ['mosr:collect:info'], func: () => handleDetail(row), type: 'primary'})
+        btn.push({label: '详情', prem: ['special:fund:info'], func: () => handleDetail(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-        btn.push({label: '编辑', prem: ['mosr:collect:resubmit'], func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '编辑', prem: ['special:fund:edit'], func: () => handleEdit(row), type: 'primary'})
         }
         return (
             <div style={{width: '100%'}}>
@@ -145,7 +145,6 @@ const tableConfig = reactive({
               {
                 buttons.has("delete") ?
                 <popover-delete name={row.name} type={'专项资金'} btnType={'danger'}
-                                perm={['mosr:requirement:del']}
                                 onDelete={() => handleDelete(row)}/>
                 : ''
               }
@@ -157,7 +156,7 @@ const tableConfig = reactive({
   api: '/workflow/mosr/special/fund',
   params: {},
   btns: [
-    {name: '新增', key: 'add', color: '#DED0B2', auth: ''},
+    {name: '新增', key: 'add', color: '#DED0B2', auth: ['special:fund:add']},
     // {name: '导出', key: '_export', color: '#DED0B2', auth: ''},
   ]
 })

From 7a38c34da92b4aad3457b8082442c4914a435806 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 9 Jul 2024 19:35:04 +0800
Subject: [PATCH 17/18] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/detail.vue | 46 ++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/plan/detail.vue b/src/views/plan/detail.vue
index 7d0842c..e7350d2 100644
--- a/src/views/plan/detail.vue
+++ b/src/views/plan/detail.vue
@@ -5,7 +5,7 @@
         <el-col :span="8">
           <el-form-item label="年度计划名称" prop="annualPlanName">
             <div v-if="isEdit">
-              <el-input  v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
+              <el-input v-model="formData.annualPlanName" placeholder="请输入年度计划名称" clearable>
               </el-input>
               <el-button color="#DED0B2" style="margin-left: 10px" @click="editName">提交</el-button>
             </div>
@@ -21,14 +21,16 @@
     </el-form>
     <div class="query-btn">
       <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
-      <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0" @click="editBtn">编辑</el-button>
+      <el-button color="#DED0B2" v-perm="['annual:plan:edit']" style="float: right;margin: 0 10px 10px 0"
+                 @click="editBtn">编辑
+      </el-button>
     </div>
     <el-table ref="table" :data="formData.projectList" border :header-cell-style="{background:'#f5f7fa'}">
       <el-table-column label="四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表" align="center">
         <template #default="scope">
           <el-table-column type="index" label="序号" align="center" width="60"/>
-          <el-table-column prop="projectName" label="项目名称" align="center"/>
-          <el-table-column prop="time" label="起始时间" align="center" min-width="120px">
+          <el-table-column prop="projectName" label="项目名称" align="center" width="100"/>
+          <el-table-column prop="time" label="起始时间" align="center" width="100">
             <template #default="scope">
               {{ scope.row.startTime + ' 至 ' + scope.row.endTime }}
             </template>
@@ -41,7 +43,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="departmentName" label="承办部门" align="center"/>
+          <el-table-column prop="departmentName" label="承办部门" align="center" width="90"/>
           <el-table-column prop="investmentType" label="出资类型" align="center">
             <template #default="scope">
               <div v-if="scope.row.investmentType !== null">
@@ -50,7 +52,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="projectImpact" label="项目影响" align="center">
+          <el-table-column prop="projectImpact" label="项目影响" align="center" width="90">
             <template #default="scope">
               <div v-if="scope.row.projectImpact !== null">
                 <Tag dictType="project_impact" :value="scope.row.projectImpact"/>
@@ -58,7 +60,7 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
-          <el-table-column prop="businessSegment" label="所属业务板块" align="center">
+          <el-table-column prop="businessSegment" label="所属业务板块" align="center" width="110">
             <template #default="scope">
               <div v-if="scope.row.businessSegment !== null">
                 <Tag dictType="business_segment" :value="scope.row.businessSegment"/>
@@ -69,10 +71,7 @@
           <el-table-column prop="resultForm" label="预期成果形式" align="center" min-width="100px">
             <template #default="scope">
               <div v-if="scope.row.resultForm !== null">
-                <el-tag effect="plain">{{
-                    filterDict(cacheStore.getDict('result_form'), scope.row.resultForm)
-                  }}
-                </el-tag>
+                  <Tag style="margin-top: 3px" dictType="result_form" v-for="item in scope.row.resultForm" :value="item"/>
               </div>
               <div v-else>--</div>
             </template>
@@ -101,6 +100,17 @@
               <div v-else>--</div>
             </template>
           </el-table-column>
+          <el-table-column prop="prospectiveIntellectualProperty" label="预期知识产权" align="center" width="190">
+            <template #default="scope">
+              <div style="text-align: left">
+                发明专利（{{ scope.row.inventionPatent ? scope.row.inventionPatent : 0 }}）项，<br>
+                实用新型专利（{{ scope.row.newPatent ? scope.row.newPatent : 0 }}）项，<br>
+                软件著作权（{{ scope.row.softwareCopyright ? scope.row.softwareCopyright : 0 }}）项，<br>
+                著作权（{{ scope.row.copyright ? scope.row.copyright : 0 }}）项，<br>
+                其他（{{ scope.row.other ? scope.row.other : 0 }}）项，
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="intellectualProperty" label="知识产权状况" align="center">
             <template #default="scope">
               <div v-if="scope.row.intellectualProperty !== null">
@@ -128,7 +138,7 @@
 <script setup>
 import {toThousands} from '@/utils/changePrice.js'
 import {ElNotification} from "element-plus";
-import {getPlan,editPlan} from "@/api/project-demand/summary";
+import {getPlan, editPlan} from "@/api/project-demand/summary";
 import {useCacheStore} from '@/stores/cache.js'
 import {exportExcel} from "@/utils/export-excel";
 
@@ -146,10 +156,10 @@ const exportTable = () => {
   }
   exportExcel($table, (5 + (Object.keys(formData.value.projectList[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目年度计划表", 2)
 }
-const editName=()=>{
-  let param={
-    annualPlanId:route.query.annualPlanId,
-    annualPlanName:formData.value.annualPlanName
+const editName = () => {
+  let param = {
+    annualPlanId: route.query.annualPlanId,
+    annualPlanName: formData.value.annualPlanName
   }
   editPlan(param).then(res => {
     ElNotification({
@@ -158,12 +168,12 @@ const editName=()=>{
       type: res.code === 1000 ? 'success' : 'error'
     })
     if (res.code === 1000) {
-      isEdit.value=false
+      isEdit.value = false
     }
   })
 }
 const editBtn = () => {
-  isEdit.value=true
+  isEdit.value = true
 }
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;

From 7836450a100b971668dc1098c8b9dad0bfa02530 Mon Sep 17 00:00:00 2001
From: wenhua <1084668738@qq.com>
Date: Tue, 9 Jul 2024 23:31:10 +0800
Subject: [PATCH 18/18] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/steps/index.vue                        |  6 +++---
 src/layout/navbar/Hamburger.vue                       |  5 +++++
 src/layout/siderbar/MenuItem.vue                      | 11 ++++++++++-
 .../project-management/mobledetail/StepsMoblie.vue    |  6 +++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 5057855..e1c8bae 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -323,9 +323,9 @@ watchEffect(() => {
   cursor: not-allowed;
 }
 .is-active {
-  color: #BEA266;
-}
-.is-end {
   color: #67c23a;
 }
+.is-end {
+  color: #BEA266;
+}
 </style>
diff --git a/src/layout/navbar/Hamburger.vue b/src/layout/navbar/Hamburger.vue
index 2b516d7..1cade5c 100644
--- a/src/layout/navbar/Hamburger.vue
+++ b/src/layout/navbar/Hamburger.vue
@@ -1,4 +1,5 @@
 <template>
+  <span class="sys-name">科技创新项目管理平台</span>
   <div class="toggle" @click="toggleClick">
     <component :is="siderbarStore.getSiderBarStatus() ? 'Fold' : 'Expand'" class="icon"></component>
   </div>
@@ -13,6 +14,10 @@ const toggleClick = () => {
 </script>
 
 <style lang="scss" scoped>
+.sys-name {
+  padding-left: 10px;
+  font-weight: bold;
+}
 .toggle{
   line-height: 65px;
   border-top-left-radius: 10px;
diff --git a/src/layout/siderbar/MenuItem.vue b/src/layout/siderbar/MenuItem.vue
index 74fc400..f47654d 100644
--- a/src/layout/siderbar/MenuItem.vue
+++ b/src/layout/siderbar/MenuItem.vue
@@ -17,7 +17,9 @@
           </a>
         </div>
         <div v-else>
-          <svg-icon :name="item.icon"/>
+          <el-icon>
+            <svg-icon :name="item.icon" class="menu-item-icon"/>
+          </el-icon>
           <span>{{ item.title }}</span>
         </div>
       </template>
@@ -60,3 +62,10 @@ const checkMenuItem = (item) => {
 
 </script>
 
+<!-- <style lang="scss" scoped>
+.menu-item-icon {
+  width: 18px !important;
+  height: 18px !important;
+  margin-left: 0;
+}
+</style> -->
\ No newline at end of file
diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue
index 91cbdf3..32d0280 100644
--- a/src/views/project-management/mobledetail/StepsMoblie.vue
+++ b/src/views/project-management/mobledetail/StepsMoblie.vue
@@ -323,9 +323,9 @@ watchEffect(() => {
   cursor: not-allowed;
 }
 .is-active {
-  color: #BEA266;
-}
-.is-end {
   color: #67c23a;
 }
+.is-end {
+  color: #BEA266;
+}
 </style>