From e1543e05b438599a7db6a65ec24eb7ca1bf69af7 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Wed, 20 Aug 2025 00:00:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(expense-management):=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在成本详情、支出详情和分摊详情页面中重新启用年份和月份选择功能
-优化日期选择器的格式和价值格式
- 在搜索时去除月份参数的前置0，确保正确传递参数
- 调整搜索表单的样式，移除多余的样式属性
---
 .../expense-management/cost-detail/index.vue  | 62 +++++++++++--------
 .../expend-detail/index.vue                   | 60 ++++++++++--------
 .../expense-management/share-detail/index.vue | 62 ++++++++++---------
 3 files changed, 102 insertions(+), 82 deletions(-)

diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
index 1c8373c..974e1b4 100644
--- a/src/views/expense-management/cost-detail/index.vue
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -26,32 +26,32 @@ import {
 const router = useRouter()
 const route = useRoute()
 const searchConfig = ref([
-  // {
-  //   label: '年份',
-  //   prop: 'rdYear',
-  //   component: 'el-date-picker',
-  //   props: {
-  //     placeholder: '请选择年份',
-  //     clearable: true,
-  //     type: 'year',
-  //     format: 'YYYY',
-  //     valueFormat: 'YYYY',
-  //   },
-  //   colProps: {}
-  // },
-  // {
-  //   label: '月份',
-  //   prop: 'rdMonth',
-  //   component: 'el-date-picker',
-  //   props: {
-  //     placeholder: '请选择月份',
-  //     clearable: true,
-  //     type: 'month',
-  //     format: 'MM',
-  //     valueFormat: 'MM',
-  //   },
-  //   colProps: {}
-  // },
+  {
+    label: '年份',
+    prop: 'rdYear',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择年份',
+      clearable: true,
+      type: 'year',
+      format: 'YYYY',
+      valueFormat: 'YYYY',
+    },
+    colProps: {}
+  },
+  {
+    label: '月份',
+    prop: 'rdMonth',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择月份',
+      clearable: true,
+      type: 'month',
+      format: 'MM',
+      valueFormat: 'MM',
+    },
+    colProps: {}
+  },
   {
     label: '主项目',
     prop: 'masterProjectName',
@@ -284,7 +284,15 @@ getMasterProjectName()
 getSubprojectName()
 
 const search = (val) => {
-  tableConfig.params = {...val}
+  // 去除 rdMonth 前置0
+
+  let param={
+    ...val
+  }
+  if (param.rdMonth) {
+    param.rdMonth = parseInt(param.rdMonth, 10).toString();
+  }
+  tableConfig.params = {...param}
   tableIns.value.refresh()
 }
 
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index 67a0bcf..f13f6e8 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -20,32 +20,32 @@ const router = useRouter()
 const route = useRoute()
 const searchConfig = ref(
     [
-      // {
-      //   label: '年份',
-      //   prop: 'paymentYear',
-      //   component: 'el-date-picker',
-      //   props: {
-      //     placeholder: '请选择年份',
-      //     clearable: true,
-      //     type: 'year',
-      //     format: 'YYYY',
-      //     valueFormat: 'YYYY',
-      //   },
-      //   colProps: {}
-      // },
-      // {
-      //   label: '月份',
-      //   prop: 'paymentMonth',
-      //   component: 'el-date-picker',
-      //   props: {
-      //     placeholder: '请选择月份',
-      //     clearable: true,
-      //     type: 'month',
-      //     format: 'MM',
-      //     valueFormat: 'MM',
-      //   },
-      //   colProps: {}
-      // },
+      {
+        label: '年份',
+        prop: 'paymentYear',
+        component: 'el-date-picker',
+        props: {
+          placeholder: '请选择年份',
+          clearable: true,
+          type: 'year',
+          format: 'YYYY',
+          valueFormat: 'YYYY',
+        },
+        colProps: {}
+      },
+      {
+        label: '月份',
+        prop: 'paymentMonth',
+        component: 'el-date-picker',
+        props: {
+          placeholder: '请选择月份',
+          clearable: true,
+          type: 'month',
+          format: 'MM',
+          valueFormat: 'MM',
+        },
+        colProps: {}
+      },
   {
     label: '主项目',
     prop: 'masterProjectName',
@@ -286,7 +286,13 @@ const getSubprojectName =async (val) => {
 getMasterProjectName()
 getSubprojectName()
 const search = (val) => {
-  tableConfig.params = {...val}
+  let param={
+    ...val
+  }
+  if (param.paymentMonth) {
+    param.paymentMonth = parseInt(param.paymentMonth, 10).toString();
+  }
+  tableConfig.params = {...param}
   tableIns.value.refresh()
 }
 const init = async () => {
diff --git a/src/views/expense-management/share-detail/index.vue b/src/views/expense-management/share-detail/index.vue
index 97f3091..44999df 100644
--- a/src/views/expense-management/share-detail/index.vue
+++ b/src/views/expense-management/share-detail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" ></fvSearchForm>
 <!--  <el-button color="#DED0B2" style="float: left;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
 
   <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"   @selectionChange="selectionChange">
@@ -24,32 +24,32 @@ import {
 const router = useRouter()
 const route = useRoute()
 const searchConfig = ref([
-  // {
-  //   label: '年份',
-  //   prop: 'paymentYear',
-  //   component: 'el-date-picker',
-  //   props: {
-  //     placeholder: '请选择年份',
-  //     clearable: true,
-  //     type: 'year',
-  //     format: 'YYYY',
-  //     valueFormat: 'YYYY',
-  //   },
-  //   colProps: {}
-  // },
-  // {
-  //   label: '月份',
-  //   prop: 'paymentMonth',
-  //   component: 'el-date-picker',
-  //   props: {
-  //     placeholder: '请选择月份',
-  //     clearable: true,
-  //     type: 'month',
-  //     format: 'MM',
-  //     valueFormat: 'MM',
-  //   },
-  //   colProps: {}
-  // },
+  {
+    label: '年份',
+    prop: 'paymentYear',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择年份',
+      clearable: true,
+      type: 'year',
+      format: 'YYYY',
+      valueFormat: 'YYYY',
+    },
+    colProps: {}
+  },
+  {
+    label: '月份',
+    prop: 'paymentMonth',
+    component: 'el-date-picker',
+    props: {
+      placeholder: '请选择月份',
+      clearable: true,
+      type: 'month',
+      format: 'M',
+      valueFormat: 'M',
+    },
+    colProps: {}
+  },
   {
     label: '主项目',
     prop: 'masterProjectName',
@@ -249,7 +249,13 @@ getMasterProjectName()
 getSubprojectName()
 
 const search = (val) => {
-  tableConfig.params = {...val}
+  let param={
+    ...val
+  }
+  if (param.paymentMonth) {
+    param.paymentMonth = parseInt(param.paymentMonth, 10).toString();
+  }
+  tableConfig.params = {...param}
   tableIns.value.refresh()
 }
 const headBtnClick = (key) => {