feat: 恢复重建PC端 项目填报

packages/screen/src/component/FileUpload/FileUpload.vue

@@ -1,7 +1,7 @@
 <!-- FileUpload.vue -->
 <template>
   <div class="file-upload">
-    <UploadBlock v-model="modelValue" :type="type" :multiple="multiple" :limit="limit" :placeholder="placeholder" />
+    <UploadBlock v-model="modelValue" :type="type" :multiple="multiple" :limit="limit" :placeholder="placeholder" :customFileType="fileType" />
     <PreviewBlock v-model:file-list="modelValue" :type="type" />
   </div>
 </template>
@@ -45,6 +45,11 @@ const props = defineProps({
   placeholder: {
     type: String,
     default: ''
+  },
+  // 自定义fileType
+  fileType: {
+    type: Number,
+    default: null,
   }
 })
 

packages/screen/src/component/FileUpload/UploadBlock.vue

@@ -2,8 +2,9 @@
 <template>
   <div class="upload-block">
     <el-button type="primary" @click="showFileInput">
-      <el-icon><Upload /></el-icon>选择文件</el-button
+      <el-icon>
-    >
+        <Upload />
+      </el-icon>选择文件</el-button>
     <input class="inner-file" ref="fileRef" type="file" @change="uploadFiles" :accept="getAccept()" />
   </div>
 </template>
@@ -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 == 'image') fileType = 1
-      if(props.type == 'video') fileType = 2
+      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;

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({
-                    router.push({
+                    name: 'projectAdd',
-                        name: 'projectAdd',
+                    params: {
-                        params: {
+                        data: encodeURIComponent(JSON.stringify(form)),
-                            data: encodeURIComponent(JSON.stringify(form))
+                    }
-                        }
+                })
-                    })
+                modelVisible.value = false;
-                    modelVisible.value = false;
-                }
             })
                 .catch((err) => {
                     ElMessage.error('请处理表单中的错误项');

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" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -269,8 +266,68 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="监理单位联系电话" prop="监理单位联系电话">
+                        <el-form-item label="施工图设计批复文件(附件)" prop="施工图设计批复文件" label-width="200px">
-                            <el-input v-model="form.supervisionUnitPhone"></el-input>
+                            <FileUpload type="image" :limit="9" v-model="designApprovalFiles" :fileType=2 />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="施工合同时间" prop="施工合同时间">
+                            <el-date-picker type="date" v-model="form.contractTime" clearable format="YYYY-MM-DD"
+                                value-format="YYYY-MM-DD">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="施工合同金额" prop="施工合同金额">
+                            <el-input-number v-model="form.contractAmount" :controls="false">
+                                <template #suffix>
+                                    <span>万元</span>
+                                </template>
+                            </el-input-number>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="施工合同(附件)" prop="施工合同">
+                            <FileUpload type="image" :limit="9" v-model="contractFiles" :fileType=3 />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="建设完成投资" prop="建设完成投资">
+                            <el-input-number v-model="form.completedInvestment" :controls="false">
+                                <template #suffix>
+                                    <span>万元</span>
+                                </template>
+                            </el-input-number>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="交竣工验收时间" prop="交竣工验收时间">
+                            <el-date-picker type="date" v-model="form.acceptanceTime" clearable format="YYYY-MM-DD"
+                                value-format="YYYY-MM-DD">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="交竣工证书(附件)" prop="交竣工证书" label-width="200px">
+                            <FileUpload type="image" :limit="9" v-model="acceptanceFiles" :fileType=4 />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="其他佐证文件" prop="其他佐证文件">
+                            <FileUpload type="image" :limit="9" v-model="otherFiles" :fileType=6 />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="完工项目上传图片(附件)" prop="完工项目上传图片" label-width="200px">
+                            <FileUpload type="image" :limit="9" v-model="completedFiles" :fileType=5 />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -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);
+        // console.log('form', form.value.projectExpenseType)
-    } else {
-
     }
 })