fix: bug

src/pages/declareManage/finalInspectionDeclare/declarationFinal/index.vue

@@ -6,8 +6,7 @@ import * as echarts from 'echarts'
 import { useRoute, useRouter } from 'vue-router'
 import { submitFinal } from '@/http/apis/declareMange/finalInspectionDeclare'
 import { projectDetail } from '@/http/apis/projectStoreManage/projectStore'
-import ActualPerformanceIndicatorsDialog
-  from '@/pages/declareManage/initialInspectionRecord/uploadInitMaterials/components/actualPerformanceIndicatorsDialog.vue'
+import ProjectContentDialog from '@/pages/projectCollection/projectCollectionEnter/components/projectContentDialog.vue'
 const uploadUrl = store.dictStore.uploadUrl,
   route = useRoute(),
   { proxy } = getCurrentInstance(),
@@ -202,7 +201,7 @@ const chart1Ref = ref(), chart2Ref = ref(), chart3Ref = ref(),
           id: route.query.id,
           isCompletedLogCollection: formData.value.isCompletedLogCollection,
           finalAcceptanceMaterials: JSON.stringify(formData.value.finalAcceptanceMaterials),
-          actualPerformanceIndicators: formData.value.actualPerformanceIndicators && JSON.stringify(formData.value.actualPerformanceIndicators) || undefined
+          beseExpectedResults: formData.value.beseExpectedResults && JSON.stringify(formData.value.beseExpectedResults) || undefined
         }
         try {
           await submitFinal(route.name === 'declarationFinal' ? 1 : 2, { projectInfo: postData })
@@ -222,7 +221,7 @@ const chart1Ref = ref(), chart2Ref = ref(), chart3Ref = ref(),
     formData.value = {
       isCompletedLogCollection: res.data.isCompletedLogCollection,
       finalAcceptanceMaterials: res.data.finalAcceptanceMaterials ? JSON.parse(res.data.finalAcceptanceMaterials) : formData.value.finalAcceptanceMaterials,
-      actualPerformanceIndicators: res.data.actualPerformanceIndicators && JSON.parse(res.data.actualPerformanceIndicators) || res.data.actualPerformanceIndicators && JSON.parse(res.data.actualPerformanceIndicators)
+      beseExpectedResults: res.data.beseExpectedResults && JSON.parse(res.data.beseExpectedResults) || res.data.beseExpectedResults && JSON.parse(res.data.beseExpectedResults)
     }
     formData.value.finalAcceptanceMaterials = formData.value.finalAcceptanceMaterials.map(i => {
       return {
@@ -231,7 +230,8 @@ const chart1Ref = ref(), chart2Ref = ref(), chart3Ref = ref(),
           return {
             ...j,
             isHave: ['软件类系统开发、部署等完成情况对照表', '信息安全等级保护测评报告', '用户使用报告', 'IRS应用试运行报告', '终验意见'].includes(j.name) ? true : j.isHave,
-            required: ['软件类系统开发、部署等完成情况对照表', '信息安全等级保护测评报告', '用户使用报告', 'IRS应用试运行报告', '终验意见'].includes(j.name) ? true : j.required
+            // required: ['软件类系统开发、部署等完成情况对照表', '信息安全等级保护测评报告', '用户使用报告', 'IRS应用试运行报告', '终验意见'].includes(j.name) ? true : j.required
+            required: true
           }
         })
       }
@@ -264,24 +264,14 @@ const chart1Ref = ref(), chart2Ref = ref(), chart3Ref = ref(),
   // 实际成效指标
   column1 = [
     {
-      label: '核心业务',
-      prop: 'businessName',
-      key: 'businessName'
+      label: '项目主要内容',
+      prop: 'mainContent',
+      key: 'mainContent'
     },
     {
-      label: '实际成效指标',
-      prop: 'name',
-      key: 'name'
-    },
-    {
-      label: '数值',
-      prop: 'nums',
-      key: 'nums'
-    },
-    {
-      label: '单位',
-      prop: 'unit',
-      key: 'unit'
+      label: '业务对象',
+      prop: 'businessObject',
+      key: 'businessObject'
     },
     {
       label: '操作',
@@ -301,13 +291,13 @@ const chart1Ref = ref(), chart2Ref = ref(), chart3Ref = ref(),
   },
   setContent = (data) => {
     if (projectContentIndex.value === undefined) {
-      formData.value.actualPerformanceIndicators = formData.value.actualPerformanceIndicators?.length ? [...formData.value.actualPerformanceIndicators, ...data] : data
+      formData.value.beseExpectedResults.push(data)
     } else {
-      formData.value.actualPerformanceIndicators[projectContentIndex.value] = data[0]
+      formData.value.beseExpectedResults[projectContentIndex.value] = data
     }
   },
   delProjectContent = (index) => {
-    formData.value.actualPerformanceIndicators.splice(index, 1)
+    formData.value.beseExpectedResults.splice(index, 1)
   }
 onMounted(async () => {
   await nextTick()
@@ -490,16 +480,16 @@ onMounted(async () => {
             </el-radio-group>
           </el-form-item>
           <el-form-item
-            label="实际成效指标"
+            label="项目内容与预期成效"
             label-width="170"
-            prop="actualPerformanceIndicators"
+            prop="beseExpectedResults"
             :rules="[{required:true,message:'请选择'}]"
           >
             <table-list
               :pagination="false"
               style="width: 100%"
               :column="column1"
-              :data="formData.actualPerformanceIndicators"
+              :data="formData.beseExpectedResults"
               :empty-temp="false"
             >
               <template #action="{scope}">
@@ -579,12 +569,14 @@ onMounted(async () => {
       <el-button type="primary" :loading="submitLoading" @click="submit(formRef)"> 提交 </el-button>
     </div>
   </div>
-  <actual-performance-indicators-dialog
+
+  <project-content-dialog
     :visible="projectContentDialogData.visible"
     :data="projectContentDialogData.data"
     @set-content="setContent"
     @close="projectContentDialogData.visible=false"
   />
+
 </template>
 <style lang="less">
 .uploadInitfinalAcceptanceMaterials{

src/pages/declareManage/projectDeclare/declarePage/components/plannedUseResources.vue

@@ -160,7 +160,7 @@
     <el-form-item v-if="formData.isCommonComponent==='1'" prop="isProduceData">
       <el-table :data="formData.commonComponent" style="width: 100%">
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="state" label="*公告组件名称">
+        <el-table-column prop="state" label="*公共组件名称">
           <template #default="scope">
             <el-form-item
               :prop="`commonComponent[${scope.$index}].componentName`"

src/pages/projectStoreManage/projectStore/projectDetail/components/basicInfo.vue

@@ -336,7 +336,7 @@ watch(() => props.detailData, val => {
       <el-descriptions-item label="是否使用云资源" :span="2">
         {{ detailData.isCloudResource===1?'是':'否' }}
       </el-descriptions-item>
-      <el-descriptions-item label="云资源" :span="2">
+      <el-descriptions-item v-if="detailData.isCloudResource===1" label="云资源" :span="2">
         <el-table :data="detailData.cloudResource" style="width: 100%">
           <el-table-column prop="cloudResourceType" label="云资源类型" />
           <el-table-column prop="baseSpecification" label="基础规格" />
@@ -348,19 +348,19 @@ watch(() => props.detailData, val => {
       <el-descriptions-item label="是否产生数据" :span="2">
         {{ detailData.isProduceData===1?'是':'否' }}
       </el-descriptions-item>
-      <el-descriptions-item label="数据列表" :span="2">
+      <el-descriptions-item v-if="detailData.isProduceData===1" label="数据列表" :span="2">
         <el-table :data="detailData.produceData" style="width: 100%">
           <el-table-column prop="dataDirectoryName" label="数据目录名称" />
           <el-table-column prop="dataItem" label="数据项" />
         </el-table>
       </el-descriptions-item>
-      <el-descriptions-item label="是否是用公共组件" :span="2">
+      <el-descriptions-item label="是否使用公共组件" :span="2">
         {{ detailData.isCommonComponent===1?'是':'否' }}
       </el-descriptions-item>
-      <el-descriptions-item label="公共组件列表" :span="2">
+      <el-descriptions-item v-if="detailData.isCommonComponent===1" label="公共组件列表" :span="2">
         <el-table :data="detailData.commonComponent" style="width: 100%">
-          <el-table-column prop="componentName" label="数据目录名称" />
-          <el-table-column prop="componentType" label="数据项" />
+          <el-table-column prop="componentName" label="公共组件名称" />
+          <el-table-column prop="componentType" label="公共组件类型" />
         </el-table>
       </el-descriptions-item>
     </template>

src/pages/projectStoreManage/projectStore/projectDetail/components/finalInfo.vue

@@ -15,7 +15,7 @@ const data = ref(),
   getInfo = async () => {
     data.value = {
       isCompletedLogCollection: props.detailData?.isCompletedLogCollection,
-      actualPerformanceIndicators: props.detailData?.actualPerformanceIndicators && JSON.parse(props.detailData?.actualPerformanceIndicators) || [],
+      beseExpectedResults: props.detailData?.beseExpectedResults && JSON.parse(props.detailData?.beseExpectedResults) || [],
       finalAcceptanceMaterials: props.detailData.finalAcceptanceMaterials ? JSON.parse(props.detailData.finalAcceptanceMaterials) : undefined,
       finalIrsApps: props.detailData?.finalIrsApps
     }
@@ -46,24 +46,14 @@ const data = ref(),
   ],
   column1 = [
     {
-      label: '核心业务',
-      prop: 'businessName',
-      key: 'businessName'
+      label: '项目主要内容',
+      prop: 'mainContent',
+      key: 'mainContent'
     },
     {
-      label: '实际成效指标',
-      prop: 'name',
-      key: 'name'
-    },
-    {
-      label: '数值',
-      prop: 'nums',
-      key: 'nums'
-    },
-    {
-      label: '单位',
-      prop: 'unit',
-      key: 'unit'
+      label: '业务对象',
+      prop: 'businessObject',
+      key: 'businessObject'
     }
   ],
   // 应用
@@ -342,7 +332,7 @@ onMounted(async () => {
         <div class="collapse-title">实施信息</div>
       </template>
       <el-descriptions
-        v-if="data?.actualPerformanceIndicators?.length"
+        v-if="data?.beseExpectedResults?.length"
         :column="2"
         border
         class="mb-8"
@@ -350,12 +340,12 @@ onMounted(async () => {
         <el-descriptions-item label="是否完成日志数据归集" :span="2">
           {{ data.isCompletedLogCollection?'是':'否' }}
         </el-descriptions-item>
-        <el-descriptions-item label="实际成效指标" :span="2">
+        <el-descriptions-item label="项目内容与预期成效" :span="2">
           <table-list
             :pagination="false"
             style="width: 100%"
             :column="column1"
-            :data="data.actualPerformanceIndicators"
+            :data="data.beseExpectedResults"
             :empty-temp="false"
           />
         </el-descriptions-item>