From 7d5ebc8b5fac942af4a8229d6429d5596b9d1567 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Thu, 9 Apr 2026 17:03:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=81=A2=E5=A4=8D=E9=87=8D=E5=BB=BAPC?= =?UTF-8?q?=E7=AB=AF=20=E9=A1=B9=E7=9B=AE=E5=A1=AB=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/component/FileUpload/FileUpload.vue | 7 +- .../src/component/FileUpload/UploadBlock.vue | 17 ++-- .../views/ProjectManagement_Rebuild/index.js | 16 ++-- .../projectAddPage.vue | 87 +++++++++++++++++-- 4 files changed, 103 insertions(+), 24 deletions(-) diff --git a/packages/screen/src/component/FileUpload/FileUpload.vue b/packages/screen/src/component/FileUpload/FileUpload.vue index 6916ee0..709aeb1 100644 --- a/packages/screen/src/component/FileUpload/FileUpload.vue +++ b/packages/screen/src/component/FileUpload/FileUpload.vue @@ -1,7 +1,7 @@ @@ -45,6 +45,11 @@ const props = defineProps({ placeholder: { type: String, default: '' + }, + // 自定义fileType + fileType: { + type: Number, + default: null, } }) diff --git a/packages/screen/src/component/FileUpload/UploadBlock.vue b/packages/screen/src/component/FileUpload/UploadBlock.vue index 3050491..2c311f0 100644 --- a/packages/screen/src/component/FileUpload/UploadBlock.vue +++ b/packages/screen/src/component/FileUpload/UploadBlock.vue @@ -2,8 +2,9 @@ @@ -39,6 +40,11 @@ const props = defineProps({ placeholder: { type: String, default: '' + }, + // 自定义fileType + customFileType: { + type: Number, + default: null } }) @@ -104,14 +110,14 @@ const uploadFiles = async (event) => { }) if (res.code === '00000') { let fileType = 3 - if(props.type == 'image') fileType = 1 - if(props.type == 'video') fileType = 2 + if (props.type == 'image') fileType = 1 + if (props.type == 'video') fileType = 2 const url = res.data const fileData = { fileName: name, fileUrl: url, - fileType, + fileType: props.customFileType || fileType, fileSize: file.size } emit('update:modelValue', [...props.modelValue, fileData]) @@ -130,6 +136,7 @@ const uploadFiles = async (event) => { position: relative; margin-bottom: 20px; } + .inner-file { z-index: 0; position: absolute; diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/index.js b/packages/screen/src/views/ProjectManagement_Rebuild/index.js index ecc3061..bf5cf3c 100644 --- a/packages/screen/src/views/ProjectManagement_Rebuild/index.js +++ b/packages/screen/src/views/ProjectManagement_Rebuild/index.js @@ -273,15 +273,13 @@ export default () => { }; model.onConfirm = async () => { await dialogRef?.value?.dynamicComponentRef?.formRef.validate().then(() => { - if (form.projectExpenseType === '自费重修') { - router.push({ - name: 'projectAdd', - params: { - data: encodeURIComponent(JSON.stringify(form)) - } - }) - modelVisible.value = false; - } + router.push({ + name: 'projectAdd', + params: { + data: encodeURIComponent(JSON.stringify(form)), + } + }) + modelVisible.value = false; }) .catch((err) => { ElMessage.error('请处理表单中的错误项'); diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue b/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue index 6e17708..b887d96 100644 --- a/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue +++ b/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue @@ -180,10 +180,7 @@ { value: '财政评审', label: '财政评审' }, { value: '开展施工图设计', label: '开展施工图设计' }, { value: '完成施设于批复', label: '完成施设于批复' } - ]" - :key="item.value" - :label="item.label" - :value="item.value" /> + ]" :key="item.value" :label="item.label" :value="item.value" /> @@ -269,8 +266,68 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,18 +343,30 @@ import { ref, onMounted, watch, reactive, toRaw } from 'vue' import { useRouter, useRoute } from 'vue-router' +import FileUpload from '@/component/FileUpload/FileUpload.vue' const router = useRouter() const route = useRoute() const form = ref({}) const formRef = ref(null) +//附件分类: 1-现场图片/视频 2-施工图设计批复文件 3-施工合同 4-交竣工证书 5-完工项目上传图片 6-其他佐证文件 +const designApprovalFiles = ref([]) // 施工图设计批复文件 +const contractFiles = ref([]) // 施工合同 +const acceptanceFiles = ref([]) // 交竣工证书 +const completedFiles = ref([]) // 完工项目上传图片 +const otherFiles = ref([]) // 其他佐证文件 + + + +watch(() => designApprovalFiles.value, (data) => { + console.log('@@@@@', data); +}) + onMounted(() => { if (route.params.data) { const data = JSON.parse(decodeURIComponent(route.params.data)); form.value = data - // console.log('@@@@跳转过来了data', data); - } else { - + // console.log('form', form.value.projectExpenseType) } })