diff --git a/src/http/apis/declareMange/index.js b/src/http/apis/declareMange/index.js
index c059a31..edda954 100644
--- a/src/http/apis/declareMange/index.js
+++ b/src/http/apis/declareMange/index.js
@@ -37,6 +37,8 @@ const exportList = {
export const declareExport = (state, params) =>
http.get(exportList[state], { params, responseType: 'blob' }) // 导出列表
+export const firstCreatProjectEdit = (userId) => http.post(`/api/v1/user-info/first-creat-project-edit/${userId}`)
+
const projectStartList = {
1: '/api/v1/declared/start', // 项目申报-新增
2: '/api/v1/declared/restart' // 重新申报
diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue b/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue
index e6e0766..9967234 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue
@@ -1,7 +1,14 @@
+
diff --git a/src/pages/declareManage/projectDeclare/declarePage/index.vue b/src/pages/declareManage/projectDeclare/declarePage/index.vue
index 73c8f98..0972f03 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/index.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/index.vue
@@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router'
import { storeToRefs } from 'pinia'
import store from '@/store'
import BasicInfo from './components/basicInfo.vue'
+import plannedUseResources from './components/plannedUseResources.vue'
import FundsInfo from './components/fundsInfo.vue'
import FundsAllocation from './components/fundsAllocation.vue'
import AnnualPaymentPlan from './components/annualPaymentPlan.vue'
@@ -34,6 +35,7 @@ const { proxy } = getCurrentInstance(),
formConfig = ref({}),
collapseModal = ref(['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']),
basicInfoRef = ref(), // 基本信息
+ planndedUseResourcesRef = ref(), // 计划使用资源
fundsInfoRef = ref(), // 资金申报情况
fundsAllocationRef = ref(), // 资金分配情况
provincialExamineRef = ref(), // 重大项目省级联审
@@ -154,6 +156,11 @@ const { proxy } = getCurrentInstance(),
}
})
}))
+ planndedUseResourcesRef.value && form.push(new Promise((resolve, reject) => {
+ planndedUseResourcesRef.value.validForm((valid) => {
+ if (valid) resolve()
+ })
+ }))
}
Promise.all([...form]).then(async () => {
if (basicInfoRef.value.formData?.baseProjIsConfidentiality === '02') {
@@ -266,7 +273,8 @@ const { proxy } = getCurrentInstance(),
...basicInfoRef.value.formData,
...fundsInfoRef.value.formData,
...fundsAllocationRef.value.formData,
- bizDomain: basicInfoRef.value.formData?.isDigitalReform === 1 ? basicInfoRef.value.formData.bizDomain.join(',') : undefined,
+ ...planndedUseResourcesRef.value?.formData,
+ // bizDomain: basicInfoRef.value.formData?.isDigitalReform === 1 ? basicInfoRef.value.formData.bizDomain.join(',') : undefined,
baseConstructionType: basicInfoRef.value.formData?.baseConstructionType?.join(';') || '',
baseProvManDeprtType: basicInfoRef.value.formData.baseProvManDeprtType * 1 || undefined,
projectYear: fundsInfoRef.value.formData?.projectYear * 1,
@@ -277,7 +285,7 @@ const { proxy } = getCurrentInstance(),
// buildBasis: buildBasis && JSON.stringify(buildBasis),
baseProjBasis: basicInfoRef.value.formData?.baseProjBasis?.map(i => i.value)?.join(';') || undefined,
baseProjBasisFile: basicInfoRef.value.formData?.baseProjBasis?.map(i => i.fileList && JSON.stringify(changFilesParam(i.fileList)))?.join(';') || '',
- cloudType: basicInfoRef.value.formData?.isCloud && basicInfoRef.value.formData?.cloudType?.length && basicInfoRef.value.formData.cloudType.join(',') || undefined,
+ // cloudType: basicInfoRef.value.formData?.isCloud && basicInfoRef.value.formData?.cloudType?.length && basicInfoRef.value.formData.cloudType.join(',') || undefined,
baseHistorProjId: basicInfoRef.value.formData?.baseHistorProjs?.map(i => i.baseProjId)?.join(';') || '',
baseHistorProjName: basicInfoRef.value.formData?.baseHistorProjs?.map(i => i.baseProjName)?.join(';') || '',
baseHistorProjYear: basicInfoRef.value.formData?.baseHistorProjs?.map(i => i.baseProjSetYear)?.join(';') || '',
@@ -606,6 +614,7 @@ onMounted(async () => {
+
基本信息
@@ -748,8 +757,18 @@ onMounted(async () => {
+
+
+
+
+ 计划使用资源
+
+
+
diff --git a/src/pages/declareManage/projectDeclare/index.vue b/src/pages/declareManage/projectDeclare/index.vue
index 44ee0d4..502261c 100644
--- a/src/pages/declareManage/projectDeclare/index.vue
+++ b/src/pages/declareManage/projectDeclare/index.vue
@@ -1,14 +1,17 @@
-