From 377509b62a3ec373ae2635f3bd79f12f373ffc7d Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 21:41:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20=E5=88=86=E6=91=8A=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E5=B0=8F=E8=AE=A1=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DetailComponent/AllocationSummaryDetail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue
index ccd1b78..51af440 100644
--- a/src/components/DetailComponent/AllocationSummaryDetail.vue
+++ b/src/components/DetailComponent/AllocationSummaryDetail.vue
@@ -24,7 +24,7 @@
     <el-table-column prop="afterTax" label="分摊金额" align="center">
       <template #default="scope">
         <div v-if="scope.row.afterTax !== null">
-<!--          {{ toThousands(scope.row.afterTax) }}-->
+          <!--          {{ toThousands(scope.row.afterTax) }}-->
           {{ scope.row.afterTax }}
         </div>
       </template>
@@ -33,7 +33,6 @@
 </template>
 
 <script setup>
-import {toThousands} from '@/utils/changePrice.js'
 import {exportExcel} from "@/utils/export-excel";
 import {getAllocationSummaryDetails} from "@/api/expense-manage";
 
@@ -71,6 +70,7 @@ const getSummaries = (param) => {
             return prev
           }
         }, 0)}`
+        sums[index] = parseFloat(sums[index]).toFixed(2)
         // sums[index] = toThousands(sums[index])
       } else {
         sums[index] = '-'
@@ -85,7 +85,7 @@ const exportTable = () => {
   if (!$table) {
     $table = $e
   }
-  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目费用分摊表",2)
+  exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目费用分摊表", 2)
 }
 const init = () => {
   loading.value = true

From aa9001edd79941ad84ce248dc5aaaacad400d5b0 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 21:50:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=92=E6=A1=A3-=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=B1=95=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2,=20=E4=B8=93=E9=A1=B9=E8=B5=84=E9=87=91=E5=8A=A0"?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0"=E4=BA=8C=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AttachmentUpload.vue                       | 2 +-
 src/components/DetailComponent/CollectionDetail.vue       | 2 +-
 src/components/DetailComponent/SummaryDetail.vue          | 2 +-
 src/views/project-demand/requirement/add.vue              | 4 ++--
 src/views/project-management/filing/attachment.vue        | 3 ++-
 src/views/project-management/filing/upload.vue            | 3 ++-
 .../mobledetail/CollectionDetailMoblie.vue                | 2 +-
 .../mobledetail/SummaryDetailMoblie.vue                   | 8 ++++----
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/AttachmentUpload.vue b/src/components/AttachmentUpload.vue
index 2f95257..7827482 100644
--- a/src/components/AttachmentUpload.vue
+++ b/src/components/AttachmentUpload.vue
@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="其他文件">
-          <el-card style="width: 100%">
+          <el-card style="width: 100%;box-shadow: none">
             <file-upload @getFile="getOtherFile"/>
             <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
                      :data="allFileList" :isSettingCol="false" :pagination="false">
diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue
index 7c6ec41..6c3db8a 100644
--- a/src/components/DetailComponent/CollectionDetail.vue
+++ b/src/components/DetailComponent/CollectionDetail.vue
@@ -28,7 +28,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
+          <el-form-item label="专项资金名称">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 9f9ba54..ee64028 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
             <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 74fbbc6..a88b1a4 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -57,7 +57,7 @@
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
           <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable>
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -171,7 +171,7 @@ const rules = reactive({
   companyIds: [{required: true, message: '请选择所属公司', trigger: 'blur'}],
   collectType: [{required: true, message: '请选择征集类型', trigger: 'blur'}],
   deadline: [{required: true, message: '请选择截止时间', trigger: 'blur'}],
-  specialFundId: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
+  specialFundId: [{required: true, message: '请选择专项资金名称', trigger: 'blur'}],
 })
 
 const tableConfig = reactive({
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index ba98f28..a5b4949 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -116,7 +116,8 @@ const upload = () => {
       name: 'Filing/upload',
       query: {
         id: route.query.id,
-        name: activeName.value
+        name: activeName.value,
+        requirementId:requirementId.value
       }
     })
   }
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index ed3ec34..52dd235 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -162,7 +162,8 @@ const handleSubmit = async () => {
       await router.push({
         name: 'Filing/attachment',
         query:{
-          id: route.query.id
+          id: route.query.id,
+          requirementId:route.query.requirementId
         }
       })
     }
diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
index 83b15c6..ea949be 100644
--- a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue
@@ -28,7 +28,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.isSpecialFund">
-          <el-form-item label="专项资金">
+          <el-form-item label="专项资金名称">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
index 311c809..cbf239c 100644
--- a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
+++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue
@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
+          <el-form-item label="专项资金名称" prop="specialFund" v-if="localFormData.isSpecialFund">
             <span>{{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }}</span>
           </el-form-item>
         </el-col>
@@ -132,10 +132,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <file-component 
-          title="需求上报附件" 
+          <file-component
+          title="需求上报附件"
           tag="需求上报"
-          v-model:value="localFormData.fileList" 
+          v-model:value="localFormData.fileList"
           :processViewer="processViewer"
           :file-list-show="fileListShow"
           labelAlign="top"

From 58d5efb6556eb52f87f8d75397cc378195c851a7 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Fri, 28 Jun 2024 21:54:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E8=B4=B9=E7=94=A8=E5=88=86?=
 =?UTF-8?q?=E6=91=8A=E9=80=89=E6=8B=A9=E7=94=A8=E6=88=B7=E4=BC=9A=E8=A2=AB?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 6a8a2ba..cbe616e 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -39,9 +39,9 @@
           <el-table-column prop="researchPersonnel" label="研发人员" width="230">
             <template #default="scope">
               <el-form-item prop="researchPersonnel">
-                {{ scope.row.researchPersonnelName ? scope.row.researchPersonnelName : currentReachPerson.name }}
+                {{ scope.row.researchPersonnelName }}
                 <el-button @click="showPersonnelPicker(scope.row,scope.$index)">
-                  {{ scope.row.researchPersonnelName || currentReachPerson.name ? '更改' : '请选择研发人员' }}
+                  {{ scope.row.researchPersonnelName ? '更改' : '请选择研发人员' }}
                 </el-button>
               </el-form-item>
             </template>
@@ -211,13 +211,13 @@ const showPersonnelPicker = (row, index) => {
   userPicker.value.showUserPicker()
 }
 const selected = (select) => {
-  for (const selectElement of select) {
-    currentReachPerson.value = selectElement
+  if (!select || select.length === 0) {
+    return
   }
   formData.value.tableData.forEach((item, index) => {
-    if (index == currentIndex.value) {
-      item.researchPersonnel = currentReachPerson.value.id
-      item.researchPersonnelName = currentReachPerson.value.name
+    if (index === currentIndex.value) {
+      item.researchPersonnel = select[0].id
+      item.researchPersonnelName = select[0].name
     }
   })
 }
@@ -252,7 +252,7 @@ const handleAdd = () => {
     workday: '21.75',
     researchDuration: null,
   }
-  currentReachPerson.value.name=''
+  currentReachPerson.value.name = ''
   formData.value.tableData.push(row)
 }
 const handleCopy = (row) => {
@@ -260,6 +260,7 @@ const handleCopy = (row) => {
     projectId: row.projectId,
     projectName: '',
     researchPersonnel: row.researchPersonnel,
+    researchPersonnelName: row.researchPersonnelName,
     wagesPayable: row.wagesPayable,
     performance: row.performance,
     reserveFund: row.reserveFund,