diff --git a/src/App.vue b/src/App.vue index 9e6f74a..cf3138e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,19 @@ diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue b/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue index 5cb3da4..3768a49 100644 --- a/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue +++ b/src/pages/declareManage/projectDeclare/declarePage/components/accessory.vue @@ -81,7 +81,7 @@ defineExpose({ validForm, formData, setFormData }) > - + + + + + + + + { emits('changeIsFirst', val) }, @@ -549,20 +549,20 @@ watch(() => formData.value, val => { :validate-on-rule-change="false" > - - - - 否 - 是 - - - + + + + + + + + - + formData.value, val => { > 首次建设 迭代升级 + 结转建设 + 新运维 + 续运维 + + + + 关联历年项目 + + + + 复用信息 + 删除 + + + + + + 关联历年项目 + + + + 复用信息 + 删除 + + + + @@ -662,19 +701,7 @@ watch(() => formData.value, val => { /> - - - - - + @@ -806,6 +833,32 @@ watch(() => formData.value, val => { + + + + + + + + + + + formData.value, val => { /> - - - - - - - - formData.value, val => { /> - - - - 关联历年项目 - - - - 删除 - - - - - - 关联历年项目 - - - - 删除 - - - - + { formData.value = { - projectYear: data.projectYear ? data.projectYear + '' : null, declareAmount: data.declareAmount, declareHaveAmount: data.declareHaveAmount, declareGovOwnFinanceAmount: data.declareGovOwnFinanceAmount, @@ -81,18 +79,6 @@ defineExpose({ validForm, formData, setFormData }) > - - - - - - + + + *云资源类型 + + + + + + + + + + - + placeholder="请选择" + size="large" + @change="cloudTypeChange(scope.$index)" + > + + - + + + *基础规格 + + + + + + + + + + + - + placeholder="请选择" + size="large" + > + + - + + + *台数 + - + @@ -107,7 +149,10 @@ - + + + *数据目录名称 + - + + + *数据项 + @@ -160,7 +208,7 @@ - + - + @@ -206,6 +254,7 @@ - + + {{ detailData.includeCause?detailData.includeCause:'-' }} + + + {{ app.applicationName ||app.relatedExistsApplication }} diff --git a/src/pages/projectStoreManage/projectStore/projectDetail/components/projectInfo.vue b/src/pages/projectStoreManage/projectStore/projectDetail/components/projectInfo.vue index 06ff5b3..cb25e75 100644 --- a/src/pages/projectStoreManage/projectStore/projectDetail/components/projectInfo.vue +++ b/src/pages/projectStoreManage/projectStore/projectDetail/components/projectInfo.vue @@ -56,7 +56,8 @@ const props = defineProps({ props.detailData?.isEngineeringSpeed && tabList.value.push('工程形象进度') tabList.value.push('附件') props.detailData?.isRemarks && tabList.value.push('备注') - props.detailData?.projectApplications?.length && tabList.value.push('应用信息') + // props.detailData?.projectApplications?.length && tabList.value.push('应用信息') + tabList.value.push('应用信息') if (props.detailData?.safetyInputModular && JSON.parse(props.detailData.safetyInputModular)?.length) { for (let i = 0; i < JSON.parse(props.detailData.safetyInputModular).length; i++) { tabList.value.push(JSON.parse(props.detailData.safetyInputModular)[i].moduleName) diff --git a/src/pages/toDoCenter/handleDuringExamine/index.vue b/src/pages/toDoCenter/handleDuringExamine/index.vue index 4f14f10..975db5f 100644 --- a/src/pages/toDoCenter/handleDuringExamine/index.vue +++ b/src/pages/toDoCenter/handleDuringExamine/index.vue @@ -418,7 +418,7 @@ async function bohui () { 返回
+ 关联历年项目 +
- 关联历年项目 -