From 7735d200217d8726796634f0131a326e34eb7c27 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Tue, 19 Aug 2025 16:07:29 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat(expense-management):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=9A=84=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在成本明细、支出明细和共享明细页面中，为大师项目名称和子项目名称的搜索框添加本地存储功能
- 当用户输入搜索值时，从本地存储中获取已保存的项目名称选项
- 当用户清空搜索框时，将当前加载的项目名称选项保存到本地存储
- 优化了项目名称搜索的用户体验，减少了重复请求服务器的次数
---
 src/views/expense-management/cost-detail/index.vue   | 10 ++++++++++
 src/views/expense-management/expend-detail/index.vue |  9 +++++++++
 src/views/expense-management/share-detail/index.vue  | 10 ++++++++++
 3 files changed, 29 insertions(+)

diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
index aa5ef68..83cffb1 100644
--- a/src/views/expense-management/cost-detail/index.vue
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -37,6 +37,8 @@ const searchConfig = ref([
       remote: true,
       remoteMethod:async (val)=>{
         console.log('val',val)
+        searchConfig.value.find(item => item.prop == 'masterProjectName').props.options= JSON.parse(localStorage.getItem("masterProjectNameOption"))
+
         if(val){
           await getMasterProjectName( val)
 
@@ -55,6 +57,8 @@ const searchConfig = ref([
       options: [],
       remote: true,
       remoteMethod:async (val)=>{
+        searchConfig.value.find(item => item.prop == 'subProjectName').props.options= JSON.parse(localStorage.getItem("subprojectNameOption"))
+
         if(val){
          await getSubprojectName(val)
         }
@@ -235,6 +239,9 @@ const getMasterProjectName =async (val) => {
       }
       optionsMap.set(optionObj.value, optionObj);
     })
+    if(!val){
+      localStorage.setItem('masterProjectNameOption', JSON.stringify(Array.from(optionsMap.values())))
+    }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
   }
@@ -251,6 +258,9 @@ const getSubprojectName =async (val) => {
       }
       optionsMap.set(optionObj.value, optionObj);
     })
+    if(!val){
+      localStorage.setItem('subprojectNameOption', JSON.stringify(Array.from(optionsMap.values())))
+    }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
   }
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index 2d8005e..4da0b01 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -33,6 +33,8 @@ const searchConfig = ref(
       remote: true,
       remoteMethod:async (val)=>{
         console.log('val',val)
+        searchConfig.value.find(item => item.prop == 'masterProjectName').props.options= JSON.parse(localStorage.getItem("masterProjectNameOption"))
+
         if(val){
          await getMasterProjectName( val)
         }
@@ -50,6 +52,7 @@ const searchConfig = ref(
       options: [],
       remote: true,
       remoteMethod:async (val)=>{
+        searchConfig.value.find(item => item.prop == 'subProjectName').props.options= JSON.parse(localStorage.getItem("subprojectNameOption"))
         if(val){
          await getSubprojectName(val)
         }
@@ -229,6 +232,9 @@ const getMasterProjectName =async (val) => {
       }
       optionsMap.set(optionObj.value, optionObj);
     })
+    if(!val){
+      localStorage.setItem('masterProjectNameOption', JSON.stringify(Array.from(optionsMap.values())))
+    }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
   }
@@ -245,6 +251,9 @@ const getSubprojectName =async (val) => {
       }
       optionsMap.set(optionObj.value, optionObj);
     })
+    if(!val){
+      localStorage.setItem('subprojectNameOption', JSON.stringify(Array.from(optionsMap.values())))
+    }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
   }
diff --git a/src/views/expense-management/share-detail/index.vue b/src/views/expense-management/share-detail/index.vue
index f3e8a84..9c0401c 100644
--- a/src/views/expense-management/share-detail/index.vue
+++ b/src/views/expense-management/share-detail/index.vue
@@ -37,6 +37,8 @@ const searchConfig = ref([
       remote: true,
       remoteMethod:async (val)=>{
         console.log('val',val)
+        searchConfig.value.find(item => item.prop == 'masterProjectName').props.options= JSON.parse(localStorage.getItem("masterProjectNameOption"))
+
         if(val){
 
           await getMasterProjectName( val)
@@ -55,6 +57,8 @@ const searchConfig = ref([
       options: [],
       remote: true,
       remoteMethod:async (val)=>{
+        searchConfig.value.find(item => item.prop == 'subProjectName').props.options= JSON.parse(localStorage.getItem("subprojectNameOption"))
+
         if(val){
           await getSubprojectName(val)
 
@@ -190,6 +194,9 @@ const getMasterProjectName =async (val) => {
       }
       optionsMap.set(optionObj.value, optionObj);
     })
+    if(!val){
+      localStorage.setItem('masterProjectNameOption', JSON.stringify(Array.from(optionsMap.values())))
+    }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
   }
@@ -206,6 +213,9 @@ const getSubprojectName =async (val) => {
       }
       optionsMap.set(optionObj.value, optionObj);
     })
+    if(!val){
+      localStorage.setItem('subprojectNameOption', JSON.stringify(Array.from(optionsMap.values())))
+    }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'subProjectName').props.options = Array.from(optionsMap.values())
   }

From d20b96830742d9c9e268efffb7762a75dd69c570 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Tue, 19 Aug 2025 16:14:23 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat(expense-management):=20=E4=B8=BA?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B9=B4=E4=BB=BD=E5=92=8C=E6=9C=88=E4=BB=BD=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在成本明细、支出明细和分摊明细页面的搜索表单中添加了年份和月份选择器
- 优化了搜索表单的样式和布局- 注释掉了部分未使用的代码
---
 .../expense-management/cost-detail/index.vue  | 129 ++++++++++--------
 .../expend-detail/index.vue                   |  27 +++-
 .../expense-management/share-detail/index.vue |  29 +++-
 3 files changed, 126 insertions(+), 59 deletions(-)

diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
index 83cffb1..1c8373c 100644
--- a/src/views/expense-management/cost-detail/index.vue
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -1,9 +1,10 @@
 <template>
   <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 15px"></fvSearchForm>
   <div style="float: left">
-    <import-cost-excel   @success="importTheExpenseLedger"/>
+    <import-cost-excel @success="importTheExpenseLedger"/>
   </div>
-  <fvTable ref="tableIns" class="tablte" :tableConfig="tableConfig" @headBtnClick="headBtnClick" :changeExportPosition="true">
+  <fvTable ref="tableIns" class="tablte" :tableConfig="tableConfig" @headBtnClick="headBtnClick"
+           :changeExportPosition="true">
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -21,10 +22,36 @@ import {
   getMasterProjectNameOption,
   getSubprojectNameOption
 } from "@/api/project-demand/summary/index.js";
+
 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: 'masterProjectName',
@@ -35,12 +62,12 @@ const searchConfig = ref([
       filterable: true,
       options: [],
       remote: true,
-      remoteMethod:async (val)=>{
-        console.log('val',val)
-        searchConfig.value.find(item => item.prop == 'masterProjectName').props.options= JSON.parse(localStorage.getItem("masterProjectNameOption"))
+      remoteMethod: async (val) => {
+        console.log('val', val)
+        searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = JSON.parse(localStorage.getItem("masterProjectNameOption"))
 
-        if(val){
-          await getMasterProjectName( val)
+        if (val) {
+          await getMasterProjectName(val)
 
         }
       }
@@ -56,11 +83,11 @@ const searchConfig = ref([
       filterable: true,
       options: [],
       remote: true,
-      remoteMethod:async (val)=>{
-        searchConfig.value.find(item => item.prop == 'subProjectName').props.options= JSON.parse(localStorage.getItem("subprojectNameOption"))
+      remoteMethod: async (val) => {
+        searchConfig.value.find(item => item.prop == 'subProjectName').props.options = JSON.parse(localStorage.getItem("subprojectNameOption"))
 
-        if(val){
-         await getSubprojectName(val)
+        if (val) {
+          await getSubprojectName(val)
         }
       }
     },
@@ -100,19 +127,7 @@ const searchConfig = ref([
   //   },
   //   colProps: {}
   // },
-  // {
-  //   label: '归档时间',
-  //   prop: 'filingTime',
-  //   component: 'el-date-picker',
-  //   props: {
-  //     placeholder: '请选择归档时间',
-  //     clearable: true,
-  //     type:'date',
-  //     format: 'YYYY-MM-DD HH:mm',
-  //     valueFormat:'YYYY-MM-DD HH:mm',
-  //   },
-  //   colProps: {}
-  // },
+
 ])
 const tableIns = ref()
 const tableConfig = reactive({
@@ -221,44 +236,44 @@ const tableConfig = reactive({
     {name: '模板下载', key: 'down', color: '#DED0B2'},
     // {name: '导入', key: 'import', color: '#DED0B2'}
   ],
-  export:{
-    open :true,
-    fileName:`研发费用明细表`
+  export: {
+    open: true,
+    fileName: `研发费用明细表`
   }
 })
 
-const getMasterProjectName =async (val) => {
-  const res=await getExpenseMasterProjectNameOption(val)
-  if(res.code==1000){
-    let optionObj={}
+const getMasterProjectName = async (val) => {
+  const res = await getExpenseMasterProjectNameOption(val)
+  if (res.code == 1000) {
+    let optionObj = {}
     let optionsMap = new Map();
-    res.data.forEach(item=>{
-      optionObj={
-        value:item.label,
-        label:item.label
+    res.data.forEach(item => {
+      optionObj = {
+        value: item.label,
+        label: item.label
       }
       optionsMap.set(optionObj.value, optionObj);
     })
-    if(!val){
+    if (!val) {
       localStorage.setItem('masterProjectNameOption', JSON.stringify(Array.from(optionsMap.values())))
     }
     // 将 Map 转换为数组
     searchConfig.value.find(item => item.prop == 'masterProjectName').props.options = Array.from(optionsMap.values())
   }
 }
-const getSubprojectName =async (val) => {
-  const res=await getExpenseSubprojectNameOption(val)
-  if(res.code==1000){
-    let optionObj={}
+const getSubprojectName = async (val) => {
+  const res = await getExpenseSubprojectNameOption(val)
+  if (res.code == 1000) {
+    let optionObj = {}
     let optionsMap = new Map();
-    res.data.forEach(item=>{
-      optionObj={
-        value:item.label,
-        label:item.label
+    res.data.forEach(item => {
+      optionObj = {
+        value: item.label,
+        label: item.label
       }
       optionsMap.set(optionObj.value, optionObj);
     })
-    if(!val){
+    if (!val) {
       localStorage.setItem('subprojectNameOption', JSON.stringify(Array.from(optionsMap.values())))
     }
     // 将 Map 转换为数组
@@ -292,23 +307,23 @@ const exportTable = () => {
   exportExcel($table, (5 + (Object.keys(tableData.value[0]).length - 5) * 5), "四川省国有资产经营投资管理有限责任公司科技创新项目人工成本分摊明细表", 2)
 }
 //导入模板下载
-const handleImportTemplateDownload=()=>{
+const handleImportTemplateDownload = () => {
   costTemplateDownload().then(res => {
     let link = document.createElement('a')
     try {
-      let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});
+      let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'});
       let _fileName = "研发费用明细表模板.xlsx"//文件名，中文无法解析的时候会显示 _(下划线),生产环境获取不到
-      link.style.display='none';
+      link.style.display = 'none';
       // 兼容不同浏览器的URL对象
       const url = window.URL || window.webkitURL || window.moxURL;
-      link.href=url.createObjectURL(blob);
-      link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_')+1))
+      link.href = url.createObjectURL(blob);
+      link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
       url.revokeObjectURL(link.href);//销毁url对象
-    }catch (e) {
-      console.log('下载的文件出错',e)
+    } catch (e) {
+      console.log('下载的文件出错', e)
     }
   })
 }
@@ -317,9 +332,10 @@ const importTheExpenseLedger = () => {
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-form-item__label-wrap){
-  margin-left: 0!important;
+:deep(.el-form-item__label-wrap) {
+  margin-left: 0 !important;
 }
+
 :deep(.el-table__header) {
   .is-leaf:first-child {
     .cell {
@@ -335,7 +351,8 @@ const importTheExpenseLedger = () => {
     }
   }
 }
-:deep(.el-date-editor--month){
+
+:deep(.el-date-editor--month) {
   width: 100%;
 }
 </style>
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index 4da0b01..67a0bcf 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -20,7 +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: 'masterProjectName',
diff --git a/src/views/expense-management/share-detail/index.vue b/src/views/expense-management/share-detail/index.vue
index 9c0401c..97f3091 100644
--- a/src/views/expense-management/share-detail/index.vue
+++ b/src/views/expense-management/share-detail/index.vue
@@ -2,7 +2,7 @@
   <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
 <!--  <el-button color="#DED0B2" style="float: left;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
 
-  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick" style="margin-top: 15px"  @selectionChange="selectionChange">
+  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"   @selectionChange="selectionChange">
     <template #empty>
       <el-empty description="暂无数据"/>
     </template>
@@ -24,7 +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: 'masterProjectName',

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 3/6] =?UTF-8?q?refactor(expense-management):=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=B9=B6=E4=BC=98=E5=8C=96=E6=97=A5=E6=9C=9F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=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) => {

From 5808145c01519bd962545677f7bfb3a3565adb61 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Wed, 20 Aug 2025 00:02:29 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix(views):=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=BA=E5=8D=95=E6=9C=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 expense-management 模块下的 cost-detail 和 expend-detail 页面中
- 将日期选择器的 format 和 valueFormat 属性从 'MM' 修改为 'M'
- 这个修改使得日期选择器显示单个月份，而不是两位数的月份
---
 src/views/expense-management/cost-detail/index.vue   | 4 ++--
 src/views/expense-management/expend-detail/index.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/expense-management/cost-detail/index.vue b/src/views/expense-management/cost-detail/index.vue
index 974e1b4..72a8de5 100644
--- a/src/views/expense-management/cost-detail/index.vue
+++ b/src/views/expense-management/cost-detail/index.vue
@@ -47,8 +47,8 @@ const searchConfig = ref([
       placeholder: '请选择月份',
       clearable: true,
       type: 'month',
-      format: 'MM',
-      valueFormat: 'MM',
+      format: 'M',
+      valueFormat: 'M',
     },
     colProps: {}
   },
diff --git a/src/views/expense-management/expend-detail/index.vue b/src/views/expense-management/expend-detail/index.vue
index f13f6e8..0b9eac2 100644
--- a/src/views/expense-management/expend-detail/index.vue
+++ b/src/views/expense-management/expend-detail/index.vue
@@ -41,8 +41,8 @@ const searchConfig = ref(
           placeholder: '请选择月份',
           clearable: true,
           type: 'month',
-          format: 'MM',
-          valueFormat: 'MM',
+          format: 'M',
+          valueFormat: 'M',
         },
         colProps: {}
       },

From 83c01575e65d4b581654c93848c54fe63f421312 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Wed, 20 Aug 2025 09:22:49 +0800
Subject: [PATCH 5/6] =?UTF-8?q?style:=E4=BC=98=E5=8C=96=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整年份选择器的宽度为 100%，以适应页面布局
---
 src/assets/styles/index.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 448691a..0232810 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -13,6 +13,9 @@ a {
 html, body, #app, .el-container, .el-aside, .el-main {
   height: 100%;
 }
+.el-date-editor--year{
+  width: 100%!important;
+}
 
 .el-breadcrumb__item {
   line-height: 65px;

From 0efd2a7db21b359b1f0168ad3da693f517b3b308 Mon Sep 17 00:00:00 2001
From: dj <1042039504@qq.com>
Date: Fri, 22 Aug 2025 16:19:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat(project-demand):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 routerName 为 Requirement/add 且 formData.state 为 '3' 时显示提交按钮
- 在 routerName为 Requirement/edit 且 formData.state为 '3' 时显示重新提交按钮
- 为 formData 添加 state 字段初始化为 ''
---
 src/views/project-demand/requirement/add.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index c73b052..839f05e 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -121,8 +121,8 @@
     </div>
     <div style="width: 100%;height: 30px"></div>
     <div class="oper-page-btn">
-      <el-button color="#DED0B2" v-if="routerName==='Requirement/add'" @click="handleSubmit(demandForm)">提交</el-button>
-      <el-button color="#DED0B2" v-else @click="handleResubmit(demandForm)">重新提交</el-button>
+      <el-button color="#DED0B2" v-if="routerName==='Requirement/add'&&formData.state=='3'" @click="handleSubmit(demandForm)">提交</el-button>
+      <el-button color="#DED0B2" v-else-if="routerName==='Requirement/edit'&&formData.state=='3'" @click="handleResubmit(demandForm)">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
     <company-picker :multiple="true" ref="companyRef" title="请选择征集公司" @ok="sureSelectedCompany" @cancelOrClear="cancelSelectedCompany"
@@ -180,6 +180,7 @@ const formData = ref({
   collectType: '科技创新与信息化系统建设',
   deadline: '',
   collectExplain: '',
+  state: '',
   fileList: [],
   isSpecialFund: false
 })