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 @@