@@ -41,7 +41,7 @@
-
@@ -201,6 +201,8 @@ watch(() => props.showTable, (newVal) => {
}, {deep: true})
-
diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue
index 0d98534..911f8fa 100644
--- a/src/components/DetailComponent/SummaryDetail.vue
+++ b/src/components/DetailComponent/SummaryDetail.vue
@@ -103,7 +103,7 @@
-
+
{{ localFormData.specialFundAmount }}
diff --git a/src/components/Tinymce.vue b/src/components/Tinymce.vue
index d619231..265f987 100644
--- a/src/components/Tinymce.vue
+++ b/src/components/Tinymce.vue
@@ -74,7 +74,7 @@ const props = defineProps({
},
height:{
type: Number,
- default: 650
+ default: 500
}
})
const content = ref(props.value);
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 094467b..6abf334 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -148,7 +148,6 @@ const tableConfig = reactive({
return (
handleView(row)}>查看
- handleEdit(row)}>已读
)
}
@@ -175,7 +174,7 @@ const handleView = (row) => {
source: 'home'
}
})
- } else {
+ } else if (row.targetState == '20'||row.targetState == '40'||row.targetState == '50'){
router.push({
name: 'Implementation/detail',
query: {
@@ -185,6 +184,15 @@ const handleView = (row) => {
source: 'home'
}
})
+ }else if (row.targetState == '70' && row.targetId) {
+ router.push({
+ name: 'Fund/detail',
+ query: {
+ id: row.targetId,
+ state: row.state,
+ source: 'home'
+ }
+ })
}
}
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index a48da94..b1210d8 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -69,19 +69,18 @@ const tableConfig = reactive({
align: 'center',
currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
},
- // {
- // prop: 'oper',
- // label: '操作',
- // align: 'center',
- // currentRender: ({row, index}) => {
- // return (
- //
- // handleDownload(row)}>下载
- // beforeRemove(row)}>删除
- //
- // )
- // }
- // }
+ {
+ prop: 'oper',
+ label: '操作',
+ align: 'center',
+ currentRender: ({row, index}) => {
+ return (
+
+ handleDownload(row)}>下载
+
+ )
+ }
+ }
]
})
const handleDownload = (row) => {
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 0964842..285b95c 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -27,10 +27,11 @@
-
diff --git a/src/views/special-fund/index.vue b/src/views/special-fund/index.vue
index 71c4119..5dd5219 100644
--- a/src/views/special-fund/index.vue
+++ b/src/views/special-fund/index.vue
@@ -10,6 +10,8 @@