From 3746a1906327953501c3e271e153552351d8cf74 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 1 Jun 2024 22:17:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue           | 17 ++++++++++------
 src/views/expense-management/share/index.vue  | 20 +++++++++----------
 src/views/project-demand/summary/add.vue      |  1 +
 src/views/project-management/filing/index.vue |  2 +-
 .../implementation/index.vue                  |  2 +-
 .../project-management/initiation/index.vue   |  2 +-
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index f5d791e..fa2cc3c 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -114,9 +114,14 @@ watch(() => props.showTable, (newVal) => {
 watch(() => props.otherFileList, (newVal) => {
   console.log('newotherFileList',newVal)
   if (props.preview) {
-    newVal?.forEach(item => {
-      allFileList.value.push(item)
-    })
+    if(props.formData.fileList==null){
+      allFileList.value=newVal
+    }else {
+      newVal?.forEach(item => {
+        allFileList.value.push(item)
+      })
+    }
+
   }else {
     allFileList.value=newVal
   }
@@ -124,9 +129,9 @@ watch(() => props.otherFileList, (newVal) => {
 watch(() => props.formData.fileList, (newVal) => {
   console.log('newVal-fileList',newVal)
   if (props.preview) {
-    newVal?.forEach(item => {
-      allFileList.value.push(item)
-    })
+      newVal?.forEach(item => {
+        allFileList.value.push(item)
+      })
   }
 }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue
index 2956ad2..211f087 100644
--- a/src/views/expense-management/share/index.vue
+++ b/src/views/expense-management/share/index.vue
@@ -90,18 +90,18 @@ const tableConfig = reactive({
         if(row.buttons){
           buttons = new Set(Array.from(row.buttons))
         }
-        // if (buttons.has("details")) {
+        if (buttons.has("details")) {
           btn.push({label: '详情', prem: ['mosr:requirement:info'], func: () => handleDetail(row), type: 'primary'})
-        // }
-        // if (buttons.has("edit")) {
+        }
+        if (buttons.has("edit")) {
           btn.push({label: '编辑', prem: ['mosr:requirement:resubmit'], func: () => handleEdit(row), type: 'primary'})
-        // }
-        // if (buttons.has("report")) {
+        }
+        if (buttons.has("report")) {
           btn.push({label: '明细导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
-        // if (buttons.has("report")) {
+        }
+        if (buttons.has("report")) {
           btn.push({label: '汇总导出', prem: ['mosr:requirement:info'], func: () => handleReport(row), type: 'primary'})
-        // }
+        }
         return (
             <div style={{width: '100%'}}>
               {
@@ -117,11 +117,11 @@ const tableConfig = reactive({
                 ))
               }
               {
-                // buttons.has("delete") ?
+                buttons.has("delete") ?
                     <popover-delete name={row.requirementName} type={'费用分摊'} btnType={'danger'}
                                     perm={['mosr:requirement:del']}
                                     onDelete={() => handleDelete(row)}/>
-                // : ''
+                : ''
               }
             </div>
         )
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 1c35513..b6929a5 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -393,6 +393,7 @@ const handleSubmit = debounce(async (instance) => {
     // }
     let params = {
       ...formData.value,
+      isSpecialFund:false,
       deploymentId: deploymentId.value,
       fileList: otherFiles,
       singleFile: singleFile,
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 385ecf6..7f86b45 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -167,7 +167,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
       align: 'center'
     },
     {
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 4f490f4..57d4231 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -172,7 +172,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
       align: 'center'
     },
     {
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 4fc4a97..1e69b71 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -166,7 +166,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'economicEstimate',
-      label: '经济概算',
+      label: '经济概算(万元)',
       align: 'center'
     },
     {

From 495e39c8028744faa44926b0724d550e516e1fe9 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Sat, 1 Jun 2024 22:18:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20:=20=E8=A1=A8=E5=8D=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/index.vue    | 30 ++++++++++++++--
 src/views/project-management/filing/index.vue | 30 ++++++++++++++--
 .../implementation/index.vue                  | 30 ++++++++++++++--
 .../project-management/initiation/index.vue   | 34 ++++++++++++++++---
 4 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index b42ed60..f81e0e4 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -96,17 +96,41 @@ const tableConfig = reactive({
     {
       prop: 'projectType',
       label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'rdSubject',
       label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'projectImpact',
       label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'startTime',
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index 7f86b45..4630052 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -153,17 +153,41 @@ const tableConfig = reactive({
     {
       prop: 'projectType',
       label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'rdSubject',
       label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'projectImpact',
       label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'economicEstimate',
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 57d4231..ea7ceb7 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -158,17 +158,41 @@ const tableConfig = reactive({
     {
       prop: 'projectType',
       label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'rdSubject',
       label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'projectImpact',
       label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'economicEstimate',
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 1e69b71..3e00101 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -152,17 +152,41 @@ const tableConfig = reactive({
     {
       prop: 'projectType',
       label: '项目类型',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'rdSubject',
       label: '研发主体',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'projectImpact',
       label: '项目影响',
-      align: 'center'
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state !== null) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
     },
     {
       prop: 'economicEstimate',
@@ -187,7 +211,7 @@ const tableConfig = reactive({
       label: '状态',
       align: 'center',
       showOverflowTooltip: false,
-      currentRender: ({row, index}) =>{
+      currentRender: ({row, index}) => {
         if (row.state !== null) {
           return (<Tag dictType={'project_initiation'} value={row.state}/>)
         } else {
@@ -207,7 +231,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 c4db5d6719b59df24294c671c6930ff3028fab73 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 1 Jun 2024 22:54:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/special-fund/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/special-fund/detail.vue b/src/views/special-fund/detail.vue
index 3abef05..a6760a2 100644
--- a/src/views/special-fund/detail.vue
+++ b/src/views/special-fund/detail.vue
@@ -6,7 +6,7 @@
 <script setup lang="jsx">
 import {ElNotification} from "element-plus";
 import {useProcessStore} from '@/stores/processStore.js';
-import {getFundDetailProcess} from "@api/special-fund";
+import {getFundDetailProcess} from "@/api/special-fund";
 const processStore = useProcessStore()
 const route = useRoute()
 const fundData = ref({})