项目文件管理完成

src/api/hour.js

@@ -0,0 +1,10 @@
+import service from '@/utils/request'
+
+// 查询工时
+export const queryHour = (data) => {
+    return service({
+        url: '/project/queryWorkingHoursSum',
+        method: 'post',
+        data: data
+    })
+}

src/api/project.js

@@ -1,7 +1,7 @@
 import service from '@/utils/request'
 
 // 查询所有项目
-export const getAllProject = (data) => {
+export const getAllProject = () => {
     return service({
         url: '/project/queryAllProject',
         method: 'get'
@@ -60,3 +60,12 @@ export const getProjectCost = (data) => {
         data
     })
 }
+
+// 查询项目的收支分析
+export const queryProjectExpense = (code) => {
+    return service({
+        url: '/finance/queryProjectFinance',
+        method: 'GET',
+        params: { code: code }
+    })
+}

src/pinia/finance/finance.js

@@ -0,0 +1,53 @@
+import { defineStore } from 'pinia'
+import { queryProjectExpense, getAllProject } from "@/api/project"
+import { getAllUsers } from "@/api/user"
+export const useFinanceStore = defineStore('finance',() => {
+    const currentCode = ref('')
+    const currentName = ref('')
+    const allProject = reactive([])
+    const allUser = reactive([])
+    const costInfo = reactive({})
+    const getAllInfo = () => {
+        // 获取所有用户
+        getAllUsers().then(res => {
+            if (res.code === 0) {
+                allUser.length = 0
+                allUser.push(...res.data)
+            }
+        })
+        // 获取所有项目
+        getAllProject().then(res => {
+            if (res.code === 0) {
+                allProject.length = 0
+                allProject.push(...res.data)
+                currentName.value = allProject[0].name
+                currentCode.value = allProject[0].code
+                queryProjectExpense(allProject[0].code).then(res => {
+                    if (res.code === 0) {
+                        Object.assign(costInfo, res.data)
+                    }
+                })
+            }
+        })
+    }
+    const closeCurrentCode = () => {
+        currentCode.value = ''
+    }
+    const changeCurrentCode = (code) => {
+        currentCode.value = code
+        allProject.forEach(item => {
+            if (code === item.code) {
+               currentName.value = item.name
+            }
+        })
+    }
+    return {
+        allProject,
+        allUser,
+        currentCode,
+        currentName,
+        getAllInfo,
+        closeCurrentCode,
+        changeCurrentCode
+    }
+})

src/view/finance/components/projectCost.vue

@@ -2,21 +2,23 @@
   <van-row style="margin-top: 20px" @click="dateScreenShow = true">
     <van-col :span="24">
       <van-cell-group>
-        <van-cell title="筛选条件" is-link size="large" class="checkCell">
-          <template #value>
-            <van-text-ellipsis content="内容" class="cellContent"/>
+        <van-cell size="large" class="checkCell" title-class="projectTitle">
+          <template #title>
+            <van-text-ellipsis :content="projectName"/>
           </template>
-          <template #right-icon>
-            <van-icon
-              class="closeIcon"
-              name="close"
-            />
+          <template #value>
+            <van-row justify="end">
+              <van-col class="resetCostCell" @click.stop="resetCost">
+                <van-icon name="replay" />
+                <van-text-ellipsis content="重置" />
+              </van-col>
+            </van-row>
           </template>
         </van-cell>
       </van-cell-group>
     </van-col>
   </van-row>
-  <van-cell-group>
+  <van-cell-group class="costCellGroup">
     <van-cell
         v-for="item in projectCostList"
         :key="item.ID"
@@ -31,6 +33,14 @@
       </template>
     </van-cell>
   </van-cell-group>
+  <van-pagination
+      v-model="currentPage"
+      :total-items="pageTotal"
+      :items-per-page="8"
+      force-ellipses
+      @change="changePage"
+      class="pagination"
+  />
   <van-popup
       v-model:show="dateScreenShow"
       position="bottom"
@@ -49,7 +59,7 @@
                 @clear="projectCostBody.projectCode = ''"
             >
               <el-option
-                  v-for="item in projectList"
+                  v-for="item in useFinance.allProject"
                   :key="item.ID"
                   :label="item.name"
                   :value="item.code"
@@ -131,7 +141,7 @@
                 @clear="projectCostBody.reimburser = 0"
             >
               <el-option
-                  v-for="item in userList"
+                  v-for="item in useFinance.allUser"
                   :key="item.ID"
                   :label="item.nickName"
                   :value="item.ID"
@@ -165,22 +175,22 @@
     <van-cell-group style="font-size: 16px">
       <van-cell size="large" title="部门：">
         <template #value>
-          <van-text-ellipsis :content="detailInfo.department.name"/>
+          <van-text-ellipsis :content="detailInfo.department.name" class="costCellValue"/>
         </template>
       </van-cell>
       <van-cell size="large" title="支入金额：">
         <template #value>
-          <van-text-ellipsis :content="detailInfo.depositAmount"/>
+          <van-text-ellipsis :content="detailInfo.depositAmount" class="costCellValue"/>
         </template>
       </van-cell>
       <van-cell size="large" title="支出金额：">
         <template #value>
-          <van-text-ellipsis :content="detailInfo.expenditureAmount"/>
+          <van-text-ellipsis :content="detailInfo.expenditureAmount" class="costCellValue"/>
         </template>
       </van-cell>
       <van-cell size="large" title="余额：">
         <template #value>
-          <van-text-ellipsis :content="detailInfo.thenBalance"/>
+          <van-text-ellipsis :content="detailInfo.thenBalance" class="costCellValue"/>
         </template>
       </van-cell>
     </van-cell-group>
@@ -188,15 +198,22 @@
 </template>
 
 <script setup>
-import { getProjectCostType, getAllProject, getProjectCost } from '@/api/project.js'
-import { getAllUsers } from "@/api/user.js"
+import { getProjectCostType, getProjectCost } from '@/api/project.js'
+import { useFinanceStore } from '@/pinia/finance/finance'
 defineOptions({
   name: 'projectCost',
 })
+// 分页
+const currentPage = ref(1)
+const pageTotal = ref(0)
+const changePage = (val) => {
+  projectCostBody.pageInfo.page = val
+  queryProjectCost()
+}
+const useFinance = useFinanceStore()
+// 当前项目名称
 onMounted(() => {
   queryProjectCostType()
-  queryAllUsers()
-  queryAllProject()
   queryProjectCost()
 })
 // 条件显示
@@ -206,7 +223,7 @@ const projectCostBody = reactive({
     pageSize: 8
   },
   reimburser: 0,
-  projectCode: "",
+  projectCode: useFinance.currentCode,
   genre: 0,
   dayTime: "",
   monthTime: "",
@@ -223,30 +240,8 @@ const queryProjectCostType = () => {
 }
 // 项目
 const projectList = reactive([])
-const queryAllProject = () => {
-  getAllProject().then(res => {
-    if (res.code === 0) {
-      const list = res.data
-      projectList.push(...list)
-    }
-  })
-}
-// 人员
-const userList = reactive([])
-const queryAllUsers = () => {
-  getAllUsers().then(res => {
-    if (res.code === 0) {
-      userList.push(...res.data)
-    }
-  })
-}
 
 const dateScreenShow = ref(false)
-const openScreen = () => {}
-
-const dateType = ref([])
-
-const currentDate = ref([])
 
 const dateTypeColumns = [
   { id:0, text: '按日期选择', value: "day" },
@@ -254,17 +249,6 @@ const dateTypeColumns = [
   { id:2, text: '按年份选择', value: "year" }
 ]
 
-const changeDateType = (val) => {
-  const index = val.selectedIndexes[0]
-  const obj = {
-    0: [],
-    1: ['year'],
-    2: ['year','month'],
-    3: ['year','month','day'],
-  }
-  dateType.value = obj[index]
-}
-
 // 查询项目费用
 const timeTypeValue = ref('day')
 
@@ -274,8 +258,10 @@ const queryProjectCost = () => {
   getProjectCost(projectCostBody).then(res => {
     if (res.code === 0) {
       dateScreenShow.value = false
+      projectCostList.length = 0
       projectCostList.push(...res.data.list)
-      console.log(projectCostList)
+      pageTotal.value = res.data.total
+      console.log(res.data)
     }
   })
 }
@@ -290,14 +276,52 @@ const openCostDetail = (item) => {
   detailShow.value = true
   Object.assign(detailInfo,item)
 }
+
+const resetCost = () => {
+  const initial = {
+    pageInfo: {
+      page: 1,
+      pageSize: 8
+    },
+    reimburser: 0,
+    projectCode: useFinance.currentCode,
+    genre: 0,
+    dayTime: "",
+    monthTime: "",
+    yearTime: ""
+  }
+  Object.assign(projectCostBody,initial)
+  queryProjectCost()
+  currentPage.value = 1
+}
+
+// 计算属性
+const projectName = computed(() => {
+  return "项目：" + useFinance.currentName
+})
 </script>
 
 <style scoped lang="less">
-.costCell{
-  height: 64px;
+.costCellGroup{
+  height: 512px;
+  .costCell{
+    height: 64px;
+  }
+}
+.costCellValue{
+  font-size: 16px;
 }
+
 .checkCell{
   height: 45px;
+  font-size: 16px;
+  .projectTitle{
+    width: 200px;
+  }
+  .resetCostCell {
+    display: flex;
+    align-items: center;
+  }
 }
 .closeIcon{
   font-size: 24px;
@@ -307,4 +331,9 @@ const openCostDetail = (item) => {
   margin-right: 10px;
   line-height: inherit;
 }
+
+.pagination{
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
 </style>

src/view/finance/components/workHours.vue

@@ -1,11 +1,240 @@
+<template>
+  <van-row style="margin-top: 20px" @click="hourScreenShow = true">
+    <van-col :span="24">
+      <van-cell-group>
+        <van-cell :title="cellTitle" size="large" class="checkCell">
+          <template #value>
+            <van-row justify="end">
+              <van-col class="resetHourCell" @click.stop="resetHour">
+                <van-icon name="replay" />
+                <van-text-ellipsis content="重置" />
+              </van-col>
+            </van-row>
+          </template>
+        </van-cell>
+      </van-cell-group>
+    </van-col>
+  </van-row>
+  <van-cell-group class="hourCellGroup">
+    <van-cell
+        v-for="item in hourList"
+        :key="item.People"
+        class="hourCell">
+      <template #title>
+        <van-text-ellipsis :content="item.Name"/>
+      </template>
+      <template #value>
+        <van-text-ellipsis :content="totalAmount(item.PriceSum)"/>
+      </template>
+      <template #label>
+        <van-text-ellipsis :content="unitPrice(item.SumDay)"/>
+      </template>
+    </van-cell>
+  </van-cell-group>
+  <van-pagination
+      v-model="currentPage"
+      :total-items="hourTotal"
+      :items-per-page="8"
+      force-ellipses
+      @change="changePage"
+      class="pagination"
+  />
+  <van-popup
+      v-model:show="hourScreenShow"
+      position="bottom"
+      style="height: 60vh"
+      closeable
+      close-icon-position="top-right"
+  >
+    <van-row style="margin-top: 9vh">
+      <van-col :span="22" :offset="1">
+        <el-form label-width="100" label-position="left" size="large">
+          <el-form-item label="项目：">
+            <el-select
+                placeholder="请选择项目"
+                v-model="hourPageCode"
+                clearable
+                @clear="useFinance.closeCurrentCode"
+            >
+              <el-option
+                  v-for="item in useFinance.allProject"
+                  :key="item.ID"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="人员：" size="large">
+            <el-select
+                placeholder="请选择人员"
+                v-model="workHourBody.people"
+                clearable
+                @clear="workHourBody.people = 0"
+            >
+              <el-option
+                  v-for="item in useFinance.allUser"
+                  :key="item.ID"
+                  :label="item.nickName"
+                  :value="item.ID"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+              label="月份:"
+          >
+            <el-date-picker
+                v-model="workHourBody.time"
+                type="month"
+                placeholder="请选择月份"
+                format="YYYY-MM"
+                value-format="YYYY-MM"
+                clearable
+                @clear="workHourBody.time = ''"
+            />
+          </el-form-item>
+          <el-form-item
+              label="年份:"
+          >
+            <el-date-picker
+                v-model="workHourBody.yearTime"
+                type="year"
+                placeholder="请选择年份"
+                format="YYYY"
+                value-format="YYYY"
+                clearable
+                @clear="workHourBody.yearTime = ''"
+            />
+          </el-form-item>
+        </el-form>
+      </van-col>
+    </van-row>
+    <van-row style="margin-top: 3vh">
+      <van-col
+          :span="22"
+          :offset="1"
+          style="display: flex;justify-content: end"
+      >
+        <el-button
+            style="width: 25vw"
+            @click="screenHour"
+            type="primary"
+            size="large"
+        >
+          确认
+        </el-button>
+      </van-col>
+    </van-row>
+  </van-popup>
+</template>
+
 <script setup>
+import { useFinanceStore } from '@/pinia/finance/finance'
+import { queryHour } from "@/api/hour";
 
-</script>
+defineOptions({
+  name: 'workHours',
+})
+const useFinance = useFinanceStore()
+// 工时条件
+const workHourBody = reactive({
+  pageInfo: {
+    page: 1,
+    pageSize: 8
+  },
+  code: useFinance.currentCode,
+  time: '',
+  yearTime: '',
+  people: 0
+})
+const hourPageCode = ref('')
+onMounted(() => {
+  queryWorkHour()
+  hourPageCode.value = useFinance.currentCode
+})
+const hourScreenShow = ref(false)
+// 重置
+const resetHour = () => {
+  const code = useFinance.allProject[0].code
+  hourPageCode.value = code
+  useFinance.changeCurrentCode(code)
+  const initial = {
+    pageInfo: {
+      page: 1,
+      pageSize: 8
+    },
+    code: code,
+    time: '',
+    yearTime: '',
+    people: 0
+  }
+  queryHour(initial).then(res => {
+    if (res.code === 0) {
+      hourList.length = 0
+      const list = res.data.list
+      if(list !== null) {
+        hourList.push(...res.data.list)
+      }
+      hourTotal.value = res.data.total
+    }
+  })
+}
+// 分页
+const currentPage = ref(1)
+const hourTotal = ref(0)
+const hourList = reactive([])
+const changePage = (val) => {
+  workHourBody.pageInfo.page = val
+  queryWorkHour()
+}
+// 查询项目工时
+const queryWorkHour = () => {
+  workHourBody.code = useFinance.currentCode
+  queryHour(workHourBody).then(res => {
+    if (res.code === 0) {
+      hourList.length = 0
+      const list = res.data.list
+      if(list !== null) {
+        hourList.push(...res.data.list)
+      }
+      hourTotal.value = res.data.total
+      hourScreenShow.value = false
+    }
+  })
+}
 
-<template>
-  实施工时
-</template>
+const screenHour = () => {
+  useFinance.changeCurrentCode(hourPageCode.value)
+  queryWorkHour()
+}
+// 计算属性
+const totalAmount = computed(() => {
+  return (amount) => "总金额：" + amount
+})
+const unitPrice = computed(() => {
+  return (price) => "天数：" + price
+})
+
+const cellTitle = computed(() => {
+  return "项目：" + useFinance.currentName
+})
+
+</script>
 
-<style scoped>
+<style scoped lang="less">
+.resetHourCell{
+  display: flex;
+  align-items: center;
+}
+.hourCellGroup{
+  margin-top: 20px;
+  height: 512px;
+  .hourCell{
+    height: 64px;
+  }
+}
 
+.pagination{
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
 </style>

src/view/finance/finance.vue

@@ -6,15 +6,15 @@
 </template>
 
 <script setup>
+import { useFinanceStore } from "@/pinia/finance/finance"
 defineOptions({
   name: 'finance',
 })
 onMounted(() => {
-  defaultRouter()
-})
-const defaultRouter = () => {
+  getFinanceInfo()
   changeDropdown('/navigation/finance/workHours')
-}
+})
+const useFinance = useFinanceStore()
 const router = useRouter()
 const costValue = ref('/navigation/finance/workHours');
 const costOption = [
@@ -25,7 +25,9 @@ const costOption = [
   { text: '项目收支——人员费用', value: '/navigation/finance/staffCost' },
   { text: '项目收支——部门费用', value: '/navigation/finance/departmentCost' },
 ];
-
+const getFinanceInfo = () => {
+  useFinance.getAllInfo()
+}
 const changeDropdown = (val) => {
   router.push({path: val})
 }