diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/index.js b/packages/screen/src/views/ProjectManagement_Rebuild/index.js index bf5cf3c..9a0726d 100644 --- a/packages/screen/src/views/ProjectManagement_Rebuild/index.js +++ b/packages/screen/src/views/ProjectManagement_Rebuild/index.js @@ -191,6 +191,17 @@ export default () => { prop: "endTime", label: "完工或预计完工时间", }, + { + prop: "reportStatus", + label: "申报状态", + formatter: (row) => { + const statusMap = { + 0: '未申报', + 1: '已申报', + }; + return statusMap[row.reportStatus] || '未知状态'; + } + }, { prop: "approvalStatus", label: "审批状态", diff --git a/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue b/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue index b887d96..579e06e 100644 --- a/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue +++ b/packages/screen/src/views/ProjectManagement_Rebuild/projectAddPage.vue @@ -174,12 +174,12 @@ - + @@ -212,7 +212,7 @@ - + @@ -334,7 +334,7 @@
- 提交 + 提交
@@ -344,12 +344,14 @@ import { ref, onMounted, watch, reactive, toRaw } from 'vue' import { useRouter, useRoute } from 'vue-router' import FileUpload from '@/component/FileUpload/FileUpload.vue' +import { request } from '../../../../shared/utils/request' +import { ElLoading } from 'element-plus' const router = useRouter() const route = useRoute() const form = ref({}) const formRef = ref(null) -//附件分类: 1-现场图片/视频 2-施工图设计批复文件 3-施工合同 4-交竣工证书 5-完工项目上传图片 6-其他佐证文件 +// 附件分类: 1-现场图片/视频 2-施工图设计批复文件 3-施工合同 4-交竣工证书 5-完工项目上传图片 6-其他佐证文件 const designApprovalFiles = ref([]) // 施工图设计批复文件 const contractFiles = ref([]) // 施工合同 const acceptanceFiles = ref([]) // 交竣工证书 @@ -358,18 +360,67 @@ const otherFiles = ref([]) // 其他佐证文件 -watch(() => designApprovalFiles.value, (data) => { - console.log('@@@@@', data); -}) +// watch(() => designApprovalFiles.value, (data) => { +// console.log('@@@@@', data); +// }) + +// watch(() => form.value, (data) => { +// console.log('@@@@@form', data); +// }, { deep: true }) onMounted(() => { if (route.params.data) { const data = JSON.parse(decodeURIComponent(route.params.data)); - form.value = data - // console.log('form', form.value.projectExpenseType) + + if (data.projectExpenseType === '申报重修') { + form.value = { + ...data, + projectProgress: '申报审批' + } + } else { + form.value = data + } } }) +const submit = async () => { + const data = { + project: form.value, + designApprovalFiles: designApprovalFiles.value, + contractFiles: contractFiles.value, + acceptanceFiles: acceptanceFiles.value, + completedFiles: completedFiles.value, + otherFiles: otherFiles.value, + } + await formRef.value.validate().then(async () => { + try { + const loading = ElLoading.service({ + lock: true, + text: '操作中', + background: 'rgba(0, 0, 0, 0.7)', + }) + const res = await request({ + url: '/snow-ops-platform/recovery/report', + method: 'POST', + data: data, + }) + loading.close(); + if (res.code === '00000') { + router.push({ + name: 'projectManagement', + }) + } else { + throw new Error(res.message || '操作失败') + } + } catch (error) { + ElMessage.error(error.message); + } + }) + .catch((err) => { + ElMessage.error('请处理表单中的错误项'); + }); +} +