diff --git a/src/assets/home/home1.png b/src/assets/home/home1.png new file mode 100644 index 0000000..54a8911 Binary files /dev/null and b/src/assets/home/home1.png differ diff --git a/src/assets/home/home2.png b/src/assets/home/home2.png new file mode 100644 index 0000000..1ccb4e7 Binary files /dev/null and b/src/assets/home/home2.png differ diff --git a/src/assets/home/home3.png b/src/assets/home/home3.png new file mode 100644 index 0000000..ba7f4c4 Binary files /dev/null and b/src/assets/home/home3.png differ diff --git a/src/assets/home/home4.png b/src/assets/home/home4.png new file mode 100644 index 0000000..8f9485d Binary files /dev/null and b/src/assets/home/home4.png differ diff --git a/src/components/DetailComponent/ProjectAttachment.vue b/src/components/DetailComponent/ProjectAttachment.vue index 20757d6..7268acf 100644 --- a/src/components/DetailComponent/ProjectAttachment.vue +++ b/src/components/DetailComponent/ProjectAttachment.vue @@ -161,6 +161,10 @@ const handleUpload = () => { } handleSearch() getTagsOption() +onActivated(()=>{ + handleSearch() + getTagsOption() +}) diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue index ce692dc..d1c928d 100644 --- a/src/components/steps/index.vue +++ b/src/components/steps/index.vue @@ -347,7 +347,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + { toThousands(baseFormData.value?.specialFundAmount )} + : {'--'} + } +
+ ) }, { label: '部门分管领导', diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue index 26f735e..6ec23b8 100644 --- a/src/views/project-demand/requirement/add.vue +++ b/src/views/project-demand/requirement/add.vue @@ -55,6 +55,11 @@ + + + 新增专项资金 + +
@@ -245,6 +250,14 @@ const tableConfig = reactive({ ] }) localStorage.removeItem('originallyCompanySelectedList') + +const addSpecialFund=()=>{ + router.push({ + name: 'Fund/add', + query: {} + }) +} + const clickToPreview = (row) => { filePreviewShow.value = false filePreviewParam.value = { diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 37f3a04..1f099ff 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -110,7 +110,14 @@ - + + @@ -167,11 +174,18 @@ - + + - + {{ optionalChargeLeadershipList.length !== 0 ? '更改' : '请选择' }} diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue index 9ba852d..4eb3820 100644 --- a/src/views/project-management/filing/attachment.vue +++ b/src/views/project-management/filing/attachment.vue @@ -219,7 +219,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + { toThousands(baseFormData.value?.specialFundAmount )} + : {'--'} + } +
+ ) }, { label: '部门分管领导', diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue index 3225998..8586118 100644 --- a/src/views/project-management/filing/upload.vue +++ b/src/views/project-management/filing/upload.vue @@ -227,7 +227,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + { toThousands(baseFormData.value?.specialFundAmount )} + : {'--'} + } +
+ ) }, { label: '部门分管领导', diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index 33699c8..df7a35b 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -222,7 +222,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + basicData.value?.specialFundAmount ? + { toThousands(basicData.value?.specialFundAmount )} + : {'--'} + } +
+ ) }, { label: '部门分管领导', @@ -545,6 +554,7 @@ const search = (val) => { } onActivated(() => { init() + search() }) diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue index a38ce58..7cf0c41 100644 --- a/src/views/project-management/implementation/attachment.vue +++ b/src/views/project-management/implementation/attachment.vue @@ -236,7 +236,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + {toThousands(baseFormData.value?.specialFundAmount)} + : {'--'} + } +
+ ) }, { label: '部门分管领导', diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue index ed9eadd..4ad4806 100644 --- a/src/views/project-management/implementation/phase.vue +++ b/src/views/project-management/implementation/phase.vue @@ -280,7 +280,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + {toThousands(baseFormData.value?.specialFundAmount)} + : {'--'} + } +
+ ) }, { label: '部门分管领导', diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue index 91e49c4..fa34678 100644 --- a/src/views/project-management/implementation/phaseDetail.vue +++ b/src/views/project-management/implementation/phaseDetail.vue @@ -223,7 +223,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + {toThousands(baseFormData.value?.specialFundAmount)} + : {'--'} + } +
+ ) }, { label: '部门分管领导', diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue index 5ba0a00..453faf4 100644 --- a/src/views/project-management/implementation/share.vue +++ b/src/views/project-management/implementation/share.vue @@ -204,7 +204,16 @@ const schema = computed(() => { prop: 'specialFundAmount', colProps: { span: 6 - } + }, + component: () => ( +
+ { + baseFormData.value?.specialFundAmount ? + {toThousands(baseFormData.value?.specialFundAmount)} + : {'--'} + } +
+ ) }, { label: '部门分管领导', @@ -219,11 +228,11 @@ const schema = computed(() => { const baseForm = ref() const searchConfig = reactive([ { - label: '项目人员', + label: '研发人员', prop: 'researchPersonnel', component: 'el-input', props: { - placeholder: '请输入项目人员查询' + placeholder: '请输入研发人员查询' } }, { diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue index cdbc994..b864d3b 100644 --- a/src/views/project-management/implementation/upload.vue +++ b/src/views/project-management/implementation/upload.vue @@ -19,7 +19,7 @@
- +