From b41f3417f94ac347910b2287774defd9af77525f Mon Sep 17 00:00:00 2001
From: yxhc <825210484@qq.com>
Date: Tue, 3 Sep 2024 14:26:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=9C=89=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=88=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                        |  26 ++--
 .../declarePage/components/accessory.vue           |   2 +-
 .../declarePage/components/applications.vue        |  13 +-
 .../declarePage/components/basicInfo.vue           | 152 +++++++++++----------
 .../declarePage/components/fundsInfo.vue           |  14 --
 .../declarePage/components/plannedUseResources.vue | 126 ++++++++++++++---
 .../projectDeclare/declarePage/index.vue           |  21 ++-
 .../purchaseResults/fillPurchasingResult/index.vue |  19 ++-
 .../projectDetail/components/applications.vue      |   6 +-
 .../projectDetail/components/projectInfo.vue       |   3 +-
 src/pages/toDoCenter/handleDuringExamine/index.vue |   2 +-
 11 files changed, 242 insertions(+), 142 deletions(-)

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 @@
 <script setup name="App">
 // import store from '@/store'
 // console.log(store.menuStore.menuArr)
-import Updater from '@/utils/updater'
-import { ElMessageBox } from 'element-plus'
-
-const up = new Updater({
-  timer: 20000
-})
-// 更新通知
-up.on('update', () => {
-  up.stop()
-  ElMessageBox.confirm('检测到有新版本，是否更新？更新会重新加载页面，如果您有未提交的表单数据，请先保存！', '提示', {}).then(() => {
-    location.reload()
-  })
-})
+// import Updater from '@/utils/updater'
+// import { ElMessageBox } from 'element-plus'
+//
+// const up = new Updater({
+//   timer: 20000
+// })
+// // 更新通知
+// up.on('update', () => {
+//   up.stop()
+//   ElMessageBox.confirm('检测到有新版本，是否更新？更新会重新加载页面，如果您有未提交的表单数据，请先保存！', '提示', {}).then(() => {
+//     location.reload()
+//   })
+// })
 
 </script>
 
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 })
   >
     <el-row :gutter="40">
       <el-col :span="12">
-        <el-form-item label="初步设计方案">
+        <el-form-item label="项目申报书" prop="preliminaryPlanFile">
           <el-upload
             v-model:file-list="formData.preliminaryPlanFile"
             class="w-full"
diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/applications.vue b/src/pages/declareManage/projectDeclare/declarePage/components/applications.vue
index 29ed30d..0dd9d6e 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/components/applications.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/components/applications.vue
@@ -34,6 +34,9 @@ const route = useRoute(),
     ],
     applicationList: [
       { required: true, message: '请添加应用', trigger: 'blur' }
+    ],
+    includeCause: [
+      { required: true, message: '请填写不包括原因', trigger: 'blur' }
     ]
   },
   column = [
@@ -172,7 +175,8 @@ const route = useRoute(),
           ...i,
           relatedExistsApplication: i.relatedExistsApplication ? { applicationCode: i.relatedExistsApplicationCode, applicationName: i.relatedExistsApplication } : undefined
         }
-      }) : []
+      }) : [],
+      includeCause: data.includeCause
     }
   },
   // 修改是否包含应用
@@ -205,6 +209,7 @@ defineExpose({ validForm, formData, applicationData, setFormData })
           </el-radio-group>
         </el-form-item>
       </el-col>
+
       <el-col v-if="formData.includeApplication === 1" :span="24">
         <el-form-item label="包含的应用" prop="applicationList">
           <el-button
@@ -232,6 +237,12 @@ defineExpose({ validForm, formData, applicationData, setFormData })
           </table-list>
         </el-form-item>
       </el-col>
+
+      <el-col v-if="formData.includeApplication !== 1" :span="24">
+        <el-form-item label="不包含应用原因" prop="includeCause">
+          <el-input v-model="formData.includeCause" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
     </el-row>
   </el-form>
   <el-drawer
diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue b/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue
index 9967234..055bae6 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/components/basicInfo.vue
@@ -286,7 +286,7 @@ const
       })
     }
   },
-  emits = defineEmits(['changeIsFirst', 'getBasicInfoData']),
+  emits = defineEmits(['changeIsFirst', 'getBasicInfoData', 'reuseItem']),
   changeIsFirst = (val) => {
     emits('changeIsFirst', val)
   },
@@ -549,20 +549,20 @@ watch(() => formData.value, val => {
     :validate-on-rule-change="false"
   >
     <el-row :gutter="40">
-      <el-col :span="24">
-        <el-form-item label="是否涉密" prop="baseProjIsConfidentiality">
-          <el-radio-group v-model="formData.baseProjIsConfidentiality">
-            <el-radio label="01">否</el-radio>
-            <el-radio label="02">是</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-col>
+      <!--      <el-col :span="24">-->
+      <!--        <el-form-item label="是否涉密" prop="baseProjIsConfidentiality">-->
+      <!--          <el-radio-group v-model="formData.baseProjIsConfidentiality">-->
+      <!--            <el-radio label="01">否</el-radio>-->
+      <!--            <el-radio label="02">是</el-radio>-->
+      <!--          </el-radio-group>-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
       <el-col :span="24">
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="formData.projectName" maxlength="50" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="24">
         <el-form-item label="项目类型" prop="projectType">
           <el-radio-group
             v-model="formData.projectType"
@@ -570,9 +570,48 @@ watch(() => formData.value, val => {
           >
             <el-radio label="01">首次建设</el-radio>
             <el-radio label="02">迭代升级</el-radio>
+            <el-radio label="03">结转建设</el-radio>
+            <el-radio label="04">新运维</el-radio>
+            <el-radio label="05">续运维</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
+      <el-col :span="24">
+        <el-form-item v-if="formData.projectType!=='01'" label="历年项目名称" prop="baseHistorProjs">
+          <p class="text-right w-full mb-8">
+            <el-button type="primary" @click="showRelatedProjectDialog">关联历年项目</el-button>
+          </p>
+          <table-list
+            :pagination="false"
+            style="width: 100%"
+            :column="columnPro"
+            :data="formData.baseHistorProjs"
+            :empty-temp="false"
+          >
+            <template #action="{scope}">
+              <a class="text-primary" @click="delPro(scope.$index)">复用信息</a>
+              <a class="text-danger" @click="delPro(scope.$index)">删除</a>
+            </template>
+          </table-list>
+        </el-form-item>
+        <el-form-item v-else label="历年项目名称">
+          <p class="text-right w-full mb-8">
+            <el-button type="primary" @click="showRelatedProjectDialog">关联历年项目</el-button>
+          </p>
+          <table-list
+            :pagination="false"
+            style="width: 100%"
+            :column="columnPro"
+            :data="formData.baseHistorProjs"
+            :empty-temp="false"
+          >
+            <template #action="{scope}">
+              <a class="text-primary" @click="delPro(scope.$index)">复用信息</a>
+              <a class="text-danger" @click="delPro(scope.$index)">删除</a>
+            </template>
+          </table-list>
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="内容类别" prop="baseConstructionType">
           <el-checkbox-group v-model="formData.baseConstructionType">
@@ -662,19 +701,7 @@ watch(() => formData.value, val => {
           />
         </el-form-item>
       </el-col>
-      <el-col v-if="formData.baseProjIsConfidentiality==='01'" :span="12">
-        <el-form-item label="建设起止年限" prop="buildDuration">
-          <el-date-picker
-            v-model="formData.buildDuration"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            format="YYYY-MM-DD"
-            value-format="YYYY-MM-DD"
-          />
-        </el-form-item>
-      </el-col>
+
       <el-col :span="12">
         <el-form-item label="建设单位" prop="buildOrgName">
           <el-input v-model="formData.buildOrgName" placeholder="请输入" :disabled="true" />
@@ -806,6 +833,32 @@ watch(() => formData.value, val => {
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="预算年度" prop="projectYear">
+            <el-date-picker
+              v-model="formData.projectYear"
+              :disabled="$route.name==='declarePlan'||[10012,10013,10016].includes(detailData?.status)"
+              type="year"
+              placeholder="请选择"
+              format="YYYY"
+              value-format="YYYY"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col v-if="formData.baseProjIsConfidentiality==='01'" :span="12">
+          <el-form-item label="建设起止年限" prop="buildDuration">
+            <el-date-picker
+              v-model="formData.buildDuration"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+        </el-col>
+
         <el-col :span="24">
           <el-form-item label="立项依据材料" prop="baseProjBasis">
             <table-list
@@ -891,24 +944,6 @@ watch(() => formData.value, val => {
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item v-if="declareAmount>=1000&&false" label="财政编码" prop="financialCode">
-            <el-input
-              v-model="formData.financialCode"
-              maxlength="50"
-              placeholder="请填写"
-              :disabled="$route.name==='declarePlan'||[10012,10013,10016].includes(detailData?.status)"
-            />
-          </el-form-item>
-          <el-form-item v-else label="财政编码">
-            <el-input
-              v-model="formData.financialCode"
-              maxlength="50"
-              placeholder="请填写"
-              :disabled="$route.name==='declarePlan'||[10012,10013,10016].includes(detailData?.status)"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="项目概述" prop="projectOverview">
             <el-input
@@ -921,40 +956,7 @@ watch(() => formData.value, val => {
             />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item v-if="formData.projectType!=='01'" label="历年项目名称" prop="baseHistorProjs">
-            <p class="text-right w-full mb-8">
-              <el-button type="primary" @click="showRelatedProjectDialog">关联历年项目</el-button>
-            </p>
-            <table-list
-              :pagination="false"
-              style="width: 100%"
-              :column="columnPro"
-              :data="formData.baseHistorProjs"
-              :empty-temp="false"
-            >
-              <template #action="{scope}">
-                <a class="text-danger" @click="delPro(scope.$index)">删除</a>
-              </template>
-            </table-list>
-          </el-form-item>
-          <el-form-item v-else label="历年项目名称">
-            <p class="text-right w-full mb-8">
-              <el-button type="primary" @click="showRelatedProjectDialog">关联历年项目</el-button>
-            </p>
-            <table-list
-              :pagination="false"
-              style="width: 100%"
-              :column="columnPro"
-              :data="formData.baseHistorProjs"
-              :empty-temp="false"
-            >
-              <template #action="{scope}">
-                <a class="text-danger" @click="delPro(scope.$index)">删除</a>
-              </template>
-            </table-list>
-          </el-form-item>
-        </el-col>
+
         <el-col v-if="($route.name==='declarePlan')||([10012,10016,10013].includes(detailData.status))" :span="24">
           <el-form-item label="项目内容与预期成效" prop="beseExpectedResults">
             <table-list
diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/fundsInfo.vue b/src/pages/declareManage/projectDeclare/declarePage/components/fundsInfo.vue
index 66f950b..715873b 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/components/fundsInfo.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/components/fundsInfo.vue
@@ -22,7 +22,6 @@ const formData = ref({
     }
   },
   rules = {
-    projectYear: [{ required: true, message: '请选择预算年度' }],
     declareAmount: [{ required: true, message: '请输入申报金额', trigger: 'blur' }, { validator: moneyValidator, trigger: 'blur' }],
     declareHaveAmount: [{ required: true, message: '请输入自有资金', trigger: 'blur' }, { validator: moneyValidator, trigger: 'blur' }],
     declareGovOwnFinanceAmount: [
@@ -55,7 +54,6 @@ const formData = ref({
   // 回显
   setFormData = (data) => {
     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 })
   >
     <el-row :gutter="40">
       <el-col :span="12">
-        <el-form-item label="预算年度" prop="projectYear">
-          <el-date-picker
-            v-model="formData.projectYear"
-            :disabled="$route.name==='declarePlan'||[10012,10013,10016].includes(detailData?.status)"
-            type="year"
-            placeholder="请选择"
-            format="YYYY"
-            value-format="YYYY"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
         <el-form-item label="申报金额" prop="declareAmount">
           <el-input-number
             v-model="formData.declareAmount"
diff --git a/src/pages/declareManage/projectDeclare/declarePage/components/plannedUseResources.vue b/src/pages/declareManage/projectDeclare/declarePage/components/plannedUseResources.vue
index 6e41d3a..8ea557c 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/components/plannedUseResources.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/components/plannedUseResources.vue
@@ -31,42 +31,84 @@
     <el-form-item v-if="formData.isCloudResource===1" prop="cloudResource">
       <el-table :data="formData.cloudResource" style="width: 100%">
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="state" label="*云资源类型">
+        <el-table-column prop="state">
+          <template #header>
+            <span style="color: red">*</span>云资源类型
+          </template>
           <template #default="scope">
+            <!--            <el-form-item-->
+            <!--              :prop="`cloudResource[${scope.$index}].cloudResourceType`"-->
+            <!--              :rules="[{required:true,message:''}]"-->
+            <!--            >-->
+            <!--              <el-input-->
+            <!--                v-model="formData.cloudResource[scope.$index].cloudResourceType"-->
+            <!--                placeholder="云资源类型"-->
+            <!--              />-->
+            <!--            </el-form-item>-->
             <el-form-item
               :prop="`cloudResource[${scope.$index}].cloudResourceType`"
               :rules="[{required:true,message:''}]"
             >
-              <el-input
+              <el-select
                 v-model="formData.cloudResource[scope.$index].cloudResourceType"
-                placeholder="云资源类型"
-              />
+                placeholder="请选择"
+                size="large"
+                @change="cloudTypeChange(scope.$index)"
+              >
+                <el-option
+                  v-for="item in disData"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column prop="city" label="*基础规格">
+        <el-table-column prop="city">
+          <template #header>
+            <span style="color: red">*</span>基础规格
+          </template>
           <template #default="scope">
+            <!--            <el-form-item-->
+            <!--              :prop="`cloudResource[${scope.$index}].baseSpecification`"-->
+            <!--              :rules="[{required:true,message:''}]"-->
+            <!--            >-->
+            <!--              <el-input-->
+            <!--                v-model="formData.cloudResource[scope.$index].baseSpecification"-->
+            <!--                placeholder="基础规格"-->
+            <!--              />-->
+            <!--            </el-form-item>-->
+
             <el-form-item
               :prop="`cloudResource[${scope.$index}].baseSpecification`"
               :rules="[{required:true,message:''}]"
             >
-              <el-input
+              <el-select
                 v-model="formData.cloudResource[scope.$index].baseSpecification"
-                placeholder="基础规格"
-              />
+                placeholder="请选择"
+                size="large"
+              >
+                <el-option
+                  v-for="item in getDisdataItem(formData.cloudResource[scope.$index].cloudResourceType)"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="*台数">
+        <el-table-column prop="address">
+          <template #header>
+            <span style="color: red">*</span>台数
+          </template>
           <template #default="scope">
             <el-form-item
               :prop="`cloudResource[${scope.$index}].serversCount`"
               :rules="[{required:true,message:''}]"
             >
-              <el-input
-                v-model="formData.cloudResource[scope.$index].serversCount"
-                placeholder="台数"
-              />
+              <el-input-number v-model="formData.cloudResource[scope.$index].serversCount" :min="1" placeholder="台数" />
             </el-form-item>
           </template>
         </el-table-column>
@@ -107,7 +149,10 @@
     <el-form-item v-if="formData.isProduceData===1" prop="isProduceData">
       <el-table :data="formData.produceData" style="width: 100%">
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column prop="state" label="*数据目录名称">
+        <el-table-column prop="state" label="">
+          <template #header>
+            <span style="color: red">*</span>数据目录名称
+          </template>
           <template #default="scope">
             <el-form-item
               :prop="`produceData[${scope.$index}].dataDirectoryName`"
@@ -120,7 +165,10 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column prop="city" label="*数据项">
+        <el-table-column prop="city">
+          <template #header>
+            <span style="color: red">*</span>数据项
+          </template>
           <template #default="scope">
             <el-form-item
               :prop="`produceData[${scope.$index}].dataItem`"
@@ -128,7 +176,7 @@
             >
               <el-input
                 v-model="formData.produceData[scope.$index].dataItem"
-                placeholder="数据项"
+                placeholder="多个数据项时，用“；”隔开"
               />
             </el-form-item>
           </template>
@@ -160,7 +208,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="公共组件名称（强制组件数量必须>=1）">
           <template #default="scope">
             <el-form-item
               :prop="`commonComponent[${scope.$index}].componentName`"
@@ -168,12 +216,12 @@
             >
               <el-input
                 v-model="formData.commonComponent[scope.$index].componentName"
-                placeholder="数据目录名称"
+                placeholder="请输入"
               />
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column prop="city" label="*公共组件类型">
+        <el-table-column prop="city" label="公共组件类型">
           <template #default="scope">
             <el-form-item
               :prop="`commonComponent[${scope.$index}].componentType`"
@@ -181,7 +229,7 @@
             >
               <el-input
                 v-model="formData.commonComponent[scope.$index].componentType"
-                placeholder="数据项"
+                placeholder="请输入"
               />
             </el-form-item>
           </template>
@@ -206,6 +254,7 @@
 </template>
 <script setup>
 import { onMounted, ref, watch } from 'vue'
+
 const props = defineProps({
   detailData: {
     type: Object,
@@ -214,6 +263,43 @@ const props = defineProps({
     }
   }
 })
+function getDisdataItem (name) {
+  let disDataItem = []
+  disData.value.forEach(item => {
+    if (item.name === name) {
+      disDataItem = item.children
+    }
+  })
+  return disDataItem
+}
+
+function cloudTypeChange (index) {
+  formData.value.cloudResource[index].baseSpecification = ''
+}
+const disData = ref([
+  {
+    name: 'ECS',
+    children: [
+      {
+        name: '1核1G'
+      },
+      {
+        name: '2核4G'
+      }
+    ]
+  },
+  {
+    name: 'OSS',
+    children: [
+      {
+        name: '100G'
+      },
+      {
+        name: '200G'
+      }
+    ]
+  }
+])
 const ruleFormRef = ref()
 const formData = ref({
   mobileTerminalEntry: [],
diff --git a/src/pages/declareManage/projectDeclare/declarePage/index.vue b/src/pages/declareManage/projectDeclare/declarePage/index.vue
index d84eac0..a368db9 100644
--- a/src/pages/declareManage/projectDeclare/declarePage/index.vue
+++ b/src/pages/declareManage/projectDeclare/declarePage/index.vue
@@ -26,7 +26,6 @@ import { changFilesParam, reviewFileParam } from '@/utils/uploadAction'
 import { dictionary } from '@/http/apis/projectCollection/projectCollectionEnter'
 import ReviewCheck from '@/pages/declareManage/projectDeclare/declarePage/components/reviewCheck.vue'
 import { getIsShowReviewCheck } from '@/utils/getIsShowReviewCheck'
-import ProvincialExamine from '@/pages/declareManage/projectDeclare/declarePage/components/provincialExamine.vue'
 
 const { proxy } = getCurrentInstance(),
   route = useRoute(),
@@ -653,16 +652,16 @@ onMounted(async () => {
                 <funds-allocation ref="fundsAllocationRef" />
               </div>
             </el-collapse-item>
-            <el-collapse-item v-if="fundsInfoRef?.formData.declareAmount>=1000&&basicInfoRef?.formData?.baseProjIsConfidentiality==='01'" name="10" class="mb-16">
-              <template #title>
-                <div class="collapse-title">
-                  重大项目省级联审信息
-                </div>
-              </template>
-              <div class="p-24">
-                <provincial-examine ref="provincialExamineRef" />
-              </div>
-            </el-collapse-item>
+            <!--            <el-collapse-item v-if="fundsInfoRef?.formData.declareAmount>=1000&&basicInfoRef?.formData?.baseProjIsConfidentiality==='01'" name="10" class="mb-16">-->
+            <!--              <template #title>-->
+            <!--                <div class="collapse-title">-->
+            <!--                  重大项目省级联审信息-->
+            <!--                </div>-->
+            <!--              </template>-->
+            <!--              <div class="p-24">-->
+            <!--                <provincial-examine ref="provincialExamineRef" />-->
+            <!--              </div>-->
+            <!--            </el-collapse-item>-->
             <el-collapse-item
               v-if="basicInfoRef?.formData?.baseProjIsConfidentiality==='01'"
               name="4"
diff --git a/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue b/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue
index 3cd0a5a..5117b86 100644
--- a/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue
+++ b/src/pages/declareManage/purchaseResults/fillPurchasingResult/index.vue
@@ -47,7 +47,8 @@ const formRef = ref(),
       bidDoc: [],
       acceptanceLetter: []
     }],
-    developCode: ''
+    developCode: '',
+    financialCode: ''
   }),
   submitLoading = ref(false),
   submit = async (formEl) => {
@@ -67,6 +68,7 @@ const formRef = ref(),
               acceptanceLetter: i.acceptanceLetter && JSON.stringify(changFilesParam(i.acceptanceLetter))
             }
           }),
+          financialCode: formData.value.financialCode,
           developCode: formData.value.developCode
         }
         try {
@@ -116,9 +118,18 @@ onMounted(async () => {
       scroll-to-error
     >
       <el-card class="w-full mb-16">
-        <el-form-item label="发改编码" :rules="[{ required: true, message: '请输入' }]" prop="developCode">
-          <el-input v-model="formData.developCode" placeholder="请输入" />
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="发改编码" :rules="[{ required: true, message: '请输入' }]" prop="developCode">
+              <el-input v-model="formData.developCode" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="财政编码" prop="financialCode" :rules="[{ required: true, message: '请输入' }]">
+              <el-input v-model="formData.financialCode" placeholder="请填写" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-card>
       <el-card v-for="(item,index) in formData.sections" :key="index" class="w-full mb-16">
         <template #header>
diff --git a/src/pages/projectStoreManage/projectStore/projectDetail/components/applications.vue b/src/pages/projectStoreManage/projectStore/projectDetail/components/applications.vue
index 2347f83..4f1e0d5 100644
--- a/src/pages/projectStoreManage/projectStore/projectDetail/components/applications.vue
+++ b/src/pages/projectStoreManage/projectStore/projectDetail/components/applications.vue
@@ -21,8 +21,12 @@ const {
 </script>
 
 <template>
-  <el-collapse v-model="collapseModal">
+  <el-descriptions v-if="!detailData.projectApplications||detailData.projectApplications.length<1">
+    <el-descriptions-item label="不包含应用原因">{{ detailData.includeCause?detailData.includeCause:'-' }}</el-descriptions-item>
+  </el-descriptions>
+  <el-collapse v-if="detailData.projectApplications" v-model="collapseModal">
     <el-collapse-item v-for="(app,index) in detailData.projectApplications" :key="index" :name="index">
+
       <template #title>
         <div class="collapse-title">{{ app.applicationName ||app.relatedExistsApplication }}</div>
       </template>
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 () {
             </el-button>
             <el-button @click="router.go(-1)">返回</el-button>
             <el-button
-              v-if="detailData.status>=10012"
+              v-if="detailData.status===10012"
               plain
               type="danger"
               @click="rejectYear"