收入分析

web/.env.development

@@ -11,5 +11,5 @@ VITE_EDITOR = webstorm
 
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm
 // 如果使用docker-compose开发模式，设置为下面的地址或本机主机IP
-VITE_BASE_PATH = http://106.52.134.22
+VITE_BASE_PATH = http://110.40.223.170
 

web/src/view/dailyFile/dailyFile.vue

@@ -31,7 +31,6 @@
           <el-button @click="fileDialog = true">文件上传</el-button>
         </el-form-item>
       </el-form>
-
     </el-header>
     <el-main>
       <el-table

web/src/view/finance/borrowing/borrowing.vue

@@ -15,18 +15,27 @@
                 <el-form-item label="名称">
                   <el-input v-model="searchDailyExpenses.name" />
                 </el-form-item>
-                <el-form-item label="时间">
+                <el-form-item label="月份">
                   <el-date-picker
                     v-model="searchDailyExpenses.time"
-                    type="date"
-                    placeholder="选择日期"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
+                    type="month"
+                    placeholder="选择月份"
+                    format="YYYY-MM"
+                    value-format="YYYY-MM"
+                  />
+                </el-form-item>
+                <el-form-item label="年份">
+                  <el-date-picker
+                    v-model="searchDailyExpenses.yearTime"
+                    type="year"
+                    placeholder="选择年份"
+                    format="YYYY"
+                    value-format="YYYY"
                   />
                 </el-form-item>
                 <el-form-item label="类型">
                   <el-select
-                    v-model.number="searchDailyExpenses.state"
+                    v-model.number="searchDailyExpenses.genre"
                     placeholder="查询"
                     style="width: 115px"
                     clearable
@@ -333,13 +342,22 @@
                 <el-form-item label="名称">
                   <el-input v-model="searchBorrowing.name" />
                 </el-form-item>
-                <el-form-item label="时间">
+                <el-form-item label="月份">
                   <el-date-picker
                     v-model="searchBorrowing.time"
-                    type="date"
-                    placeholder="选择日期"
-                    format="YYYY-MM-DD"
-                    value-format="YYYY-MM-DD"
+                    type="month"
+                    placeholder="选择月份"
+                    format="YYYY-MM"
+                    value-format="YYYY-MM"
+                  />
+                </el-form-item>
+                <el-form-item label="年份">
+                  <el-date-picker
+                    v-model="searchBorrowing.yearTime"
+                    type="year"
+                    placeholder="选择年份"
+                    format="YYYY"
+                    value-format="YYYY"
                   />
                 </el-form-item>
                 <el-form-item>
@@ -476,11 +494,11 @@ import {
   updateDailyExpenses, updateFeeGenre
 } from '@/api/finance'
 import { getAllUsers } from '@/api/user'
+import { formatDate } from '@/utils/formatDate'
 
 // 计算属性
 const accountSum = computed(() => {
   const data = dailyExpensesData.value.dailyFeeDetails
-  console.log('计算data:', data)
   let middle = 0
   data.forEach(item => {
     middle += item.feePrice
@@ -500,6 +518,7 @@ const searchDailyExpenses = reactive({
   },
   name: '',
   time: '',
+  yearTime: '',
   state: null
 })
 // 分页
@@ -521,7 +540,8 @@ const searchBorrowing = ref({
     pageSize: 10
   },
   name: '',
-  time: ''
+  time: '',
+  yearTime: ''
 })
 // 分页
 const borrowingSizeChange = (val) => {
@@ -550,9 +570,14 @@ const queryData = async() => {
   })
   // 日常费用列表
   await queryDailyExpensesList(searchDailyExpenses).then(res => {
-    console.log('查询3：', res.data)
+    const list = res.data.list
+    if (list.length !== 0) {
+      list.forEach(item => {
+        item.applicationTime = formatDate(item.applicationTime)
+      })
+    }
     dailyExpensesTable.length = 0
-    dailyExpensesTable.push(...res.data.list)
+    dailyExpensesTable.push(...list)
     searchDailyExpenses.pageInfo.page = res.data.page
     searchDailyExpenses.pageInfo.pageSize = res.data.pageSize
     dailyExpensesTotal.value = res.data.total