Merge remote-tracking branch 'origin/master'

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">

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

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>

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>

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) {
+  if (!select || select.length === 0) {
-    currentReachPerson.value = selectElement
+    return
   }
   formData.value.tableData.forEach((item, index) => {
-    if (index == currentIndex.value) {
+    if (index === currentIndex.value) {
-      item.researchPersonnel = currentReachPerson.value.id
+      item.researchPersonnel = select[0].id
-      item.researchPersonnelName = currentReachPerson.value.name
+      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,

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({

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
       }
     })
   }

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
         }
       })
     }

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>

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 
+          <file-component
-          title="需求上报附件" 
+          title="需求上报附件"
           tag="需求上报"
-          v-model:value="localFormData.fileList" 
+          v-model:value="localFormData.fileList"
           :processViewer="processViewer"
           :file-list-show="fileListShow"
           labelAlign="top"