Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/project-demand/requirement/detail.vue

src/components/AttachmentUpload.vue

@@ -19,7 +19,7 @@
         <el-form-item label="其他文件">
           <el-card style="width: 100%">
             <file-upload @getFile="getOtherFile"/>
-            <fvTable style="width: 100%;max-height: 250px;height: 250px" v-if="showTable" :tableConfig="tableConfig"
+            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="tableConfig"
                      :data="allFileList" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -226,5 +226,7 @@ defineExpose({
 </script>
 
 <style scoped>
-
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/components/DetailComponent/Opinion.vue

@@ -11,7 +11,8 @@
 import {ElNotification} from 'element-plus';
 import {agreeTask, rejectTask} from "@/api/project-demand/index.js";
 
-import { useTagsView } from '@/stores/tagsview.js'
+import {useTagsView} from '@/stores/tagsview.js'
+
 const tagsViewStore = useTagsView()
 const route = useRoute()
 const router = useRouter()
@@ -84,7 +85,11 @@ const back = () => {
       }
       break;
     case 'Fund/detail':
-      router.push({name: 'Fund'})
+      if (route.query.source === 'home') {
+        router.push('/home')
+      } else {
+        router.push({name: 'Fund'})
+      }
       break;
     case 'Share/detail':
       router.push({name: 'Expense/share'})

src/components/DetailComponent/SpecialFundDetail.vue

@@ -30,7 +30,7 @@
         <baseTitle title="关联项目"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="projectTable"
+            <fvTable style="width: 100%;max-height:300px" v-if="showTable" :tableConfig="projectTable"
                      :data="formData.projects" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -41,7 +41,7 @@
         <baseTitle title="附件列表"></baseTitle>
         <el-col :span="24">
           <el-form-item>
-            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="fileTable"
+            <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" :tableConfig="fileTable"
                      :data="formData.files" :isSettingCol="false" :pagination="false">
               <template #empty>
                 <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
@@ -201,6 +201,8 @@ watch(() => props.showTable, (newVal) => {
 }, {deep: true})
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+:deep(.el-table--fit ){
+  height: 300px!important;
+}
 </style>

src/components/DetailComponent/SummaryDetail.vue

@@ -103,7 +103,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount" v-if="localFormData.isSpecialFund!==null||localFormData.isSpecialFund">
             <span>{{ localFormData.specialFundAmount }}</span>
           </el-form-item>
         </el-col>

src/components/Tinymce.vue

@@ -74,7 +74,7 @@ const props = defineProps({
   },
   height:{
     type: Number,
-    default: 650
+    default: 500
   }
 })
 const content = ref(props.value);