From 244f2e72b45d63fae4d77b75bcae0e53e2fceb5f Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Mon, 31 Mar 2025 14:12:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A1=B9=E7=9B=AE=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=AE=9E=E9=99=85=E7=BB=8F?=
 =?UTF-8?q?=E8=B4=B9=E9=A2=84=E7=AE=97=E5=92=8C=E4=B8=93=E9=A1=B9=E8=B5=84?=
 =?UTF-8?q?=E9=87=91=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 12 +++-
 src/components/steps/index.vue                | 32 +++++++++
 .../expend-detail/index.vue                   | 68 +++++++------------
 .../project-demand/requirement/index.vue      |  5 ++
 src/views/project-demand/summary/add.vue      |  8 +--
 src/views/project-demand/summary/index.vue    |  9 ++-
 .../project-management/filing/attachment.vue  | 39 ++++++++++-
 .../implementation/account.vue                | 39 +++++++++++
 .../implementation/phase.vue                  | 39 ++++++++++-
 .../implementation/phaseDetail.vue            | 39 ++++++++++-
 .../implementation/share.vue                  | 38 +++++++++++
 .../implementation/uploadFee.vue              | 39 +++++++++++
 12 files changed, 313 insertions(+), 54 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index efca74e..12e2991 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -10,6 +10,13 @@
             </el-input>
             </el-form-item>
         </el-col>
+        <el-col :span="6" v-if="title==='apply'">
+          <!--          label-width="106"-->
+          <el-form-item label="实际专项资金"  prop="specialFundAmount" label-width="121" >
+            <el-input v-model="localFormData.specialFundAmount" placeholder="请输入实际专项资金">
+            </el-input>
+            </el-form-item>
+        </el-col>
 <!--        <el-col :span="6" v-if="title==='apply'">-->
 <!--          &lt;!&ndash;          label-width="106"&ndash;&gt;-->
 <!--          <el-form-item label="实际专项资金"  prop="budget" label-width="120">-->
@@ -230,7 +237,7 @@ const pageInfo = reactive({
 })
 const rules = reactive({
   actualEconomicEstimate: [{required: true, message: '请输入实际经费预算', trigger: ['blur','change']}],
-  // projectChargePerson: [{required: true, message: '请选择项目负责人', trigger: 'blur'}],
+  specialFundAmount: [{required: true, message: '请输入实际专项资金', trigger: 'blur'}],
   // projectPerson: [{required: true, message: '请选择项目成员', trigger: 'blur'}],
 })
 const tagsViewStore = useTagsView()
@@ -549,7 +556,8 @@ const handleSubmit = async (instance) => {
       fileList: files,
       // singleFile: attachment.value.singleFile,
       projectId: projectId.value,
-      actualEconomicEstimate: localFormData.value.actualEconomicEstimate,
+      actualEconomicEstimate: parseFloat(localFormData.value.actualEconomicEstimate),
+      specialFundAmount: parseFloat(localFormData.value.specialFundAmount),
       preProcess: JSON.stringify(localFormData.value.preProcess)
     }
     if (sessionParams.value.preProcess && !localFormData.value.preProcess) {
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index fa1d023..9035fc4 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -294,6 +294,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
     {
       label: '产学研联合',
       prop: 'industryUniversityResearch',
@@ -335,6 +351,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index bd5aed5..7a24eac 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig">
+<!--  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>-->
+  <fvTable ref="tableIns" :tableConfig="tableConfig" style="margin-top: 15px">
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -115,114 +115,96 @@ const tableConfig = reactive({
     //   }
     // },
     {
-      prop: 'affiliatedCompany',
+      prop: 'paymentYear',
       label: '支出年份',
       align: 'center'
     },
     {
-      prop: 'projectName',
+      prop: 'paymentMonth',
       label: '月份',
       align: 'center'
     },
 
     {
-      prop: 'projectCost',
+      prop: 'masterProjectName',
       label: '主项目',
       align: 'center',
       width: 120,
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        if (row.projectCost !== null&&row.projectCost !== null&&row.projectCost!==undefined) {
-          return (<Tag dictType={'project_cost'} value={row.projectCost}/>)
-        } else {
-          return '--'
-        }
-      }
     },
 
     {
-      prop: 'time',
+      prop: 'subProjectName',
       label: '子项目',
       align: 'center',
       width: 120,
     },
     {
-      prop: 'researchStage',
+      prop: 'projectType',
       label: '项目类型',
       align: 'center',
       width: 120,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
-        if (row.researchStage&&row.researchStage !== null&&row.researchStage!==undefined) {
-          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        if (row.projectType&&row.projectType !== null&&row.projectType!==undefined) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
         } else {
           return '--'
         }
       }
     },
     {
-      prop: 'digest',
+      prop: 'rdType',
       label: 'RAD统计类型',
       align: 'center'
     },
     {
-      prop: 'digest',
+      prop: 'paymentProcessType',
       label: '付款流程类型',
       align: 'center',
-      currentRender:({row})=>{
-        return <span>{toThousands(row.afterTax)}</span>
-      }
     },
     {
-      prop: 'digest',
+      prop: 'processState',
       label: '流程状态',
       align: 'center',
-      showOverflowTooltip: false,
-      currentRender: ({row, index}) => {
-        if (row.source&&row.source !== null&&row.source!==undefined) {
-          return (<Tag dictType={'ledger_source'} value={row.source}/>)
-        } else {
-          return '--'
-        }
-      }
     },
     {
-      prop: 'digest',
+      prop: 'filingTime',
       label: '归档时间',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'paymentProcessNum',
       label: '付款流程编号',
       align: 'center',
     },
     {
-      prop: '付款/请款事由',
-      label: '来源',
-      align: 'center',
-    },
-    {
-      prop: 'digest',
+      prop: 'paymentAmount',
       label: '付款金额',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'paymentSubject',
+      label: '付款/请款事由',
+      align: 'center',
+    },
+
+    {
+      prop: 'contractNum',
       label: '合同编号',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'contractName',
       label: '合同名称',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'contractSumAmount',
       label: '合同金额(元)',
       align: 'center',
     },
   ],
-  api: '',
+  api: '/workflow/mosr/payment/list',
   params: {},
   export:{
     open :true,
diff --git a/src/views/project-demand/requirement/index.vue b/src/views/project-demand/requirement/index.vue
index 3e71bb0..7f10059 100644
--- a/src/views/project-demand/requirement/index.vue
+++ b/src/views/project-demand/requirement/index.vue
@@ -46,6 +46,11 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue
index 94e3218..d4a2820 100644
--- a/src/views/project-demand/summary/add.vue
+++ b/src/views/project-demand/summary/add.vue
@@ -183,15 +183,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="formData.isSpecialFund">
-          <el-form-item label="预估专项资金(元)" prop="specialFundAmount">
+          <el-form-item label="预估专项资金(元)" prop="forecastSpecialFundAmount">
             <el-input
-                v-model="formData.specialFundAmount"
+                v-model="formData.forecastSpecialFundAmount"
                 placeholder="请输入预估专项资金"
                 clearable
                 :formatter="(value) => value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
                 :parser="(value) => value.replace(/\$\s?|(,*)+[^0-9.]/g, '')" @change="changeCollectData"
             />
-            <!--            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入预估专项资金" :controls="false"/>-->
+            <!--            <el-input-number v-model="formData.forecastSpecialFundAmount" placeholder="请输入预估专项资金" :controls="false"/>-->
           </el-form-item>
         </el-col>
         <el-col :span="6" :style="{marginLeft:!formData.isSpecialFund?'0':'-40px'}">
@@ -447,7 +447,7 @@ const rules = reactive({
   economicEstimate: [{required: true, message: '请输入预估经费预算', trigger: ['blur', 'change']}],
   isSpecialFund: [{required: true, message: '请选择是否为专项资金', trigger: ['blur', 'change']}],
   isWithinBudget: [{required: true, message: '请选择是否在预算内', trigger: ['blur', 'change']}],
-  specialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}],
+  forecastSpecialFundAmount: [{required: true, message: '请输入专项资金', trigger: ['blur', 'change']}],
   serviceDescription: [{required: true, message: '请输入现有业务描述', trigger: ['blur', 'change']}],
   contentDescription: [{required: true, message: '请输入研发项目关键内容描述', trigger: ['blur', 'change']}]
 })
diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue
index 990d8da..240a2ae 100644
--- a/src/views/project-demand/summary/index.vue
+++ b/src/views/project-demand/summary/index.vue
@@ -88,7 +88,7 @@ const searchConfig = ref([
   },
   {
     label: '承办单位',
-    prop: 'undertaker',
+    prop: 'affiliatedCompanyId',
     component: 'el-tree-select',
     props: {
       placeholder: '请输入承办单位查询',
@@ -218,6 +218,11 @@ const tableConfig = reactive({
         return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
       }
     },
+    {
+      prop: 'processNumber',
+      label: '编号',
+      align: 'center',
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
@@ -441,7 +446,7 @@ const handleDetail = (row) => {
 }
 const init = async () => {
   const res = await getSubCompOpt()
-  searchConfig.value.find(item=>item.prop == 'undertaker').props.data = res.data
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
 }
 
 init()
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index ed272ae..7444de8 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -171,6 +171,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    }, {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -210,9 +225,24 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },{
+      label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
-      label: '预估专项资金(元)',
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -249,6 +279,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index 725df77..2904a49 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -178,6 +178,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              basicData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(basicData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
     {
       label: '产学研联合',
       prop: 'industryUniversityResearch',
@@ -219,6 +235,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              basicData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(basicData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -255,6 +287,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index f391f61..4a94545 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -244,6 +244,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    }, {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -283,9 +298,24 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    }, {
+      label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
-      label: '预估专项资金(元)',
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -322,6 +352,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index 3772162..1d5f1bf 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -184,6 +184,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    },{
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -223,9 +238,24 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    }, {
+      label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
-      label: '预估专项资金(元)',
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -262,6 +292,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index 12a99ea..e985f27 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -159,6 +159,21 @@ const schema = computed(() => {
             }
           </div>
       )
+    }, {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
     },
     {
       label: '产学研联合',
@@ -201,6 +216,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -237,6 +268,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index 3b8dadd..b54e9d3 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -268,6 +268,22 @@ const schema = computed(() => {
           </div>
       )
     },
+    {
+      label: '实际经费预算',
+      prop: 'actualEconomicEstimate',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.actualEconomicEstimate ?
+                  <span>{toThousands(baseFormData.value?.actualEconomicEstimate)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
     {
       label: '产学研联合',
       prop: 'industryUniversityResearch',
@@ -316,6 +332,22 @@ const schema = computed(() => {
     },
     {
       label: '预估专项资金(元)',
+      prop: 'forecastSpecialFundAmount',
+      colProps: {
+        span: 6
+      },
+      component: () => (
+          <div>
+            {
+              baseFormData.value?.forecastSpecialFundAmount ?
+                  <span>{toThousands(baseFormData.value?.forecastSpecialFundAmount)}</span>
+                  : <span>{'--'}</span>
+            }
+          </div>
+      )
+    },
+    {
+      label: '实际专项资金(元)',
       prop: 'specialFundAmount',
       colProps: {
         span: 6
@@ -352,6 +384,13 @@ const schema = computed(() => {
       colProps: {
         span: 6
       }
+    },
+    {
+      label: '主项目',
+      prop: 'masterProjectName',
+      colProps: {
+        span: 6
+      }
     }
   ]
 })