From 1e29e6bdc406fc1597d0673e4cd109771de6cf23 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Tue, 1 Apr 2025 23:57:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(expense-management):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expense-management/cost-detail/index.vue  | 85 +++++++------------
 .../expend-detail/index.vue                   | 24 +++---
 .../expense-management/share-detail/index.vue | 82 +++++++-----------
 3 files changed, 73 insertions(+), 118 deletions(-)

diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
index 037db85..25e324c 100644
--- a/src/views/expense-management/cost-detail/index.vue
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -28,17 +28,17 @@ const searchConfig = ref([
       checkStrictly: true
     }
   },
-  {
-    label: '子项目',
-    prop: 'subProjectName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入子项目查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
+  // {
+  //   label: '子项目',
+  //   prop: 'subProjectName',
+  //   component: 'el-input',
+  //   props: {
+  //     placeholder: '请输入子项目查询',
+  //     clearable: true,
+  //     filterable: true,
+  //     checkStrictly: true
+  //   }
+  // },
   // {
   //   label: '项目类型',
   //   prop: 'projectType',
@@ -80,112 +80,89 @@ const tableConfig = reactive({
     //   }
     // },
     {
-      prop: 'affiliatedCompany',
-      label: '支出年份',
+      prop: 'paymentYear',
+      label: '支付年份',
       align: 'center',
       width: 80
     },
     {
-      prop: 'projectName',
-      label: '月份',
+      prop: 'paymentMonth',
+      label: '支付月份',
       align: 'center',
       width: 80
     },
 
     {
-      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: 'certificateDate',
       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}/>)
-        } else {
-          return '--'
-        }
-      }
     },
     {
-      prop: 'digest',
+      prop: 'voucherNumber',
       label: '凭证号',
       align: 'center'
     },
     {
-      prop: 'digest',
+      prop: 'entryNumber',
       label: '分录号',
       align: 'center',
-      currentRender:({row})=>{
-        return <span>{toThousands(row.afterTax)}</span>
-      }
+
     },
     {
-      prop: 'digest',
+      prop: 'remarks',
       label: '摘要',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'accountCode',
       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: 'accountName',
       label: '科目名称',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'auxiliaryItem',
       label: '辅助项',
       align: 'center',
     },
     {
-      prop: 'digest',
+      prop: 'recordedAmount',
       label: '会计凭证记载金额(元)',
       align: 'center',
       width: 170
     },
     {
-      prop: 'digest',
+      prop: 'rdAmount',
       label: '归集研发费用金额(元)',
       align: 'center',
       width: 170
     },
   ],
-  api: '',
+  api: '/workflow/mosr/payment/list',
   params: {},
   export:{
     open :true,
-    fileName:`科技创新费用支出明细.xlsx`
+    fileName:`研发费用明细表.xlsx`
   }
 })
 const search = (val) => {
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index 26f251f..2f24c0c 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" ></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig" >
     <template #empty>
       <el-empty description="暂无数据"/>
@@ -27,17 +27,17 @@ const searchConfig = ref(
       checkStrictly: true
     }
   },
-  {
-    label: '子项目',
-    prop: 'subProjectName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入子项目查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
+  // {
+  //   label: '子项目',
+  //   prop: 'subProjectName',
+  //   component: 'el-input',
+  //   props: {
+  //     placeholder: '请输入子项目查询',
+  //     clearable: true,
+  //     filterable: true,
+  //     checkStrictly: true
+  //   }
+  // },
   {
     label: '项目类型',
     prop: 'projectType',
diff --git a/src/views/expense-management/share-detail/index.vue b/src/views/expense-management/share-detail/index.vue
index 4d22bb8..5fab720 100644
--- a/src/views/expense-management/share-detail/index.vue
+++ b/src/views/expense-management/share-detail/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick">
+<!--  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>-->
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" style="margin-top: 15px">
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -15,23 +15,23 @@ import {reactive, ref} from "vue";
 const router = useRouter()
 const route = useRoute()
 const searchConfig = reactive([
+  // {
+  //   label: '分摊名称',
+  //   prop: 'shareName',
+  //   component: 'el-input',
+  //   props: {
+  //     placeholder: '请输入分摊名称查询',
+  //     clearable: true,
+  //     filterable: true,
+  //     checkStrictly: true
+  //   }
+  // },
   {
-    label: '分摊名称',
-    prop: 'shareName',
-    component: 'el-input',
-    props: {
-      placeholder: '请输入分摊名称查询',
-      clearable: true,
-      filterable: true,
-      checkStrictly: true
-    }
-  },
-  {
-    label: '分摊月份',
+    label: '支付月份',
     prop: 'apportionmentMonth',
     component: 'el-date-picker',
     props: {
-      placeholder: '请选择分摊月份',
+      placeholder: '请选择支付月份',
       clearable: true,
       type:'month',
       format: 'YYYY-MM',
@@ -64,85 +64,63 @@ const tableConfig = reactive({
     //   }
     // },
     {
-      prop: 'affiliatedCompany',
-      label: '支出年份',
+      prop: 'paymentYear',
+      label: '支付年份',
       align: 'center'
     },
     {
-      prop: 'projectName',
-      label: '月份',
+      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: 'researchPersonnel',
       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}/>)
-        } else {
-          return '--'
-        }
-      }
     },
     {
-      prop: 'digest',
+      prop: 'personnelNature',
       label: '人员性质',
       align: 'center'
     },
     {
-      prop: 'digest',
+      prop: 'researchDuration',
       label: '当月研发工时(天)',
       align: 'center',
-      currentRender:({row})=>{
-        return <span>{toThousands(row.afterTax)}</span>
-      }
+      // currentRender:({row})=>{
+      //   return <span>{toThousands(row.afterTax)}</span>
+      // }
     },
     {
-      prop: 'digest',
+      prop: 'workday',
       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: 'subtotal',
       label: '人工成本分摊(元)',
       align: 'center',
     },
 
   ],
-  api: '',
+  api: '/workflow/mosr/cost/share',
   params: {},
   btns: [
     {name: '添加分摊', key: 'add', color: '#DED0B2'}