项目文件管理完成

package.json

@@ -17,6 +17,7 @@
     "jsencrypt": "^3.3.2",
     "less-loader": "^12.2.0",
     "lib-flexible": "^0.3.2",
+    "moment": "^2.30.1",
     "path": "^0.12.7",
     "pinia": "^2.2.4",
     "process": "^0.11.10",

pnpm-lock.yaml

@@ -35,6 +35,9 @@ importers:
       lib-flexible:
         specifier: ^0.3.2
         version: 0.3.2
+      moment:
+        specifier: ^2.30.1
+        version: 2.30.1
       path:
         specifier: ^0.12.7
         version: 0.12.7
@@ -728,6 +731,9 @@ packages:
   mlly@1.7.1:
     resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
 
+  moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
@@ -1573,6 +1579,8 @@ snapshots:
       pkg-types: 1.2.0
       ufo: 1.5.4
 
+  moment@2.30.1: {}
+
   ms@2.1.3: {}
 
   nanoid@3.3.7: {}

src/api/collection.js

@@ -0,0 +1,10 @@
+import service from '@/utils/request'
+
+// 检索收款记录
+export const retrievalCollection = (data) => {
+    return service({
+        url: '/project/queryCollectionList',
+        method: 'POST',
+        data: data
+    })
+}

src/api/firmCost.js

@@ -0,0 +1,10 @@
+import service from '@/utils/request'
+
+// 查询费用列表
+export const queryCostList = (data) => {
+    return service({
+        url: '/expenses/queryExpensesList',
+        method: 'post',
+        data: data
+    })
+}

src/pinia/finance/finance.js

@@ -30,9 +30,6 @@ export const useFinanceStore = defineStore('finance',() => {
             }
         })
     }
-    const closeCurrentCode = () => {
-        currentCode.value = ''
-    }
     const changeCurrentCode = (code) => {
         currentCode.value = code
         allProject.forEach(item => {
@@ -47,7 +44,7 @@ export const useFinanceStore = defineStore('finance',() => {
         currentCode,
         currentName,
         getAllInfo,
-        closeCurrentCode,
-        changeCurrentCode
+        changeCurrentCode,
+        costInfo
     }
 })

src/view/finance/components/costDetail.vue

@@ -1,11 +1,25 @@
-<script setup>
-
-</script>
-
 <template>
 
 </template>
 
+<script setup>
+defineOptions({
+  name: 'costDetail',
+})
+const condition = reactive({
+  pageInfo: {
+    page: 1,
+    pageSize: 10
+  },
+  reimburser: 0,
+  genre: 0,
+  dayTime: '',
+  monthTime: '',
+  yearTime: ''
+})
+onMounted(() => {})
+</script>
+
 <style scoped>
 
 </style>

src/view/finance/components/projectPayment.vue

@@ -1,11 +1,194 @@
-<script setup>
+<template>
+  <van-row style="margin-top: 20px" @click="dateScreenShow = true">
+    <van-col :span="24">
+      <van-cell-group>
+        <van-cell size="large" class="checkCell" title-class="projectTitle">
+          <template #title>
+            <van-text-ellipsis :content="projectName"/>
+          </template>
+          <template #value>
+            <van-row justify="end">
+              <van-col class="resetPaymentCell" @click.stop="resetPayment">
+                <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="paymentCellGroup">
+    <van-cell
+        v-for="item in paymentList"
+        :key="item.ID"
+        class="paymentCell">
+      <template #title>
+        <van-text-ellipsis :content="serialNumber(item.serialNumber)"/>
+      </template>
+      <template #value>
+        <van-text-ellipsis :content="collectionAmount(item.collectionPrice)"/>
+      </template>
+      <template #label>
+        <van-text-ellipsis :content="collectionTime(item.collectionTime)"/>
+      </template>
+    </van-cell>
+  </van-cell-group>
+  <van-pagination
+      v-model="projectPaymentBody.pageInfo.page"
+      :total-items="paymentTotal"
+      :items-per-page="8"
+      force-ellipses
+      @change="checkPayment"
+      class="pagination"
+  />
+  <van-popup
+      v-model:show="dateScreenShow"
+      position="bottom"
+      style="height: 70vh"
+      closeable
+      close-icon-position="top-right"
+  >
+    <van-row style="margin-top: 8vh">
+      <van-col :span="22" :offset="1">
+        <el-form label-width="70" label-position="left" size="large">
+          <el-form-item label="项目：" size="large">
+            <el-select
+                placeholder="请选择项目"
+                v-model="projectPaymentBody.code"
+            >
+              <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="月份:"
+          >
+            <el-date-picker
+                v-model="projectPaymentBody.time"
+                type="month"
+                placeholder="请选择月份"
+                format="YYYY-MM"
+                value-format="YYYY-MM"
+                clearable
+                @clear="projectPaymentBody.time = ''"
+            />
+          </el-form-item>
+        </el-form>
+      </van-col>
+    </van-row>
+    <van-row style="margin-top: 3vh">
+      <van-col :span="22" :offset="1">
+        <van-row justify="end">
+          <van-col>
+            <van-button @click="checkPayment" type="primary">查询</van-button>
+          </van-col>
+        </van-row>
+      </van-col>
+    </van-row>
+  </van-popup>
+</template>
 
+<script setup>
+import { useFinanceStore } from '@/pinia/finance/finance'
+import { retrievalCollection } from '@/api/collection'
+import moment from "moment"
+defineOptions({
+  name: 'projectCost',
+})
+const useFinance = useFinanceStore()
+// 检索
+const dateScreenShow = ref(false)
+const projectPaymentBody = reactive({
+  pageInfo: {
+    page: 1,
+    pageSize: 8
+  },
+  code: '',
+  time: ''
+})
+const paymentList = reactive([])
+const checkPayment = () => {
+  retrievalCollection(projectPaymentBody).then(res => {
+    if (res.code === 0) {
+      dateScreenShow.value = false
+      useFinance.changeCurrentCode(projectPaymentBody.code)
+      const list = res.data.list
+      paymentList.length = 0
+      paymentList.push(...list)
+    }
+  })
+}
+onMounted(() => {
+  setTimeout(() => {
+    const info = useFinance.costInfo
+    const payment = info.collection
+    paymentList.length = 0
+    paymentList.push(...payment)
+    projectPaymentBody.code = useFinance.currentCode
+  },500)
+})
+// 重置
+const resetPayment = () => {
+  const all = useFinance.allProject
+  const condition = {
+    pageInfo: {
+      page: 1,
+      pageSize: 8
+    },
+    code: all[0].code,
+    time: ''
+  }
+  Object.assign(projectPaymentBody,condition)
+  checkPayment()
+}
+// 分页
+const paymentTotal = ref(0)
+// 计算属性..................
+const projectName = computed(() => {
+  return "项目：" + useFinance.currentName
+})
+// 单号
+const serialNumber = computed(() => {
+  return (number) => "单号：" + number
+})
+// 收款金额
+const collectionAmount = computed(() => {
+  return (amount) => "金额：" + amount
+})
+// 收款时间
+const collectionTime = computed(() => {
+  return (time) => moment(time).format("YYYY-MM-DD")
+})
 </script>
 
-<template>
-
-</template>
+<style scoped lang="less">
+.checkCell{
+  height: 45px;
+  font-size: 16px;
+  .projectTitle{
+    width: 200px;
+  }
+  .resetPaymentCell {
+    display: flex;
+    align-items: center;
+  }
+}
 
-<style scoped>
+.paymentCellGroup{
+  margin-top: 20px;
+  height: 512px;
+  .paymentCell{
+    height: 64px;
+  }
+}
 
+.pagination{
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
 </style>

src/view/finance/components/workHours.vue

@@ -32,11 +32,11 @@
     </van-cell>
   </van-cell-group>
   <van-pagination
-      v-model="currentPage"
+      v-model="workHourBody.pageInfo.page"
       :total-items="hourTotal"
       :items-per-page="8"
       force-ellipses
-      @change="changePage"
+      @change="screenHour"
       class="pagination"
   />
   <van-popup
@@ -52,9 +52,7 @@
           <el-form-item label="项目：">
             <el-select
                 placeholder="请选择项目"
-                v-model="hourPageCode"
-                clearable
-                @clear="useFinance.closeCurrentCode"
+                v-model="workHourBody.code"
             >
               <el-option
                   v-for="item in useFinance.allProject"
@@ -141,21 +139,20 @@ const workHourBody = reactive({
     page: 1,
     pageSize: 8
   },
-  code: useFinance.currentCode,
+  code: '',
   time: '',
   yearTime: '',
   people: 0
 })
-const hourPageCode = ref('')
 onMounted(() => {
-  queryWorkHour()
-  hourPageCode.value = useFinance.currentCode
+  setTimeout(() => {
+    queryWorkHour()
+  }, 500)
 })
 const hourScreenShow = ref(false)
 // 重置
 const resetHour = () => {
   const code = useFinance.allProject[0].code
-  hourPageCode.value = code
   useFinance.changeCurrentCode(code)
   const initial = {
     pageInfo: {
@@ -167,22 +164,14 @@ const resetHour = () => {
     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
-    }
-  })
+  Object.assign(workHourBody,initial)
+  screenHour()
 }
 // 分页
-const currentPage = ref(1)
 const hourTotal = ref(0)
 const hourList = reactive([])
 const changePage = (val) => {
+  currentPage.value = val
   workHourBody.pageInfo.page = val
   queryWorkHour()
 }
@@ -194,17 +183,26 @@ const queryWorkHour = () => {
       hourList.length = 0
       const list = res.data.list
       if(list !== null) {
-        hourList.push(...res.data.list)
+        hourList.push(...list)
       }
       hourTotal.value = res.data.total
-      hourScreenShow.value = false
     }
   })
 }
-
+// 检索工时
 const screenHour = () => {
-  useFinance.changeCurrentCode(hourPageCode.value)
-  queryWorkHour()
+  queryHour(workHourBody).then(res => {
+    if (res.code === 0) {
+      useFinance.changeCurrentCode(workHourBody.code)
+      hourList.length = 0
+      const list = res.data.list
+      if(list !== null) {
+        hourList.push(...list)
+      }
+      hourTotal.value = res.data.total
+      hourScreenShow.value = false
+    }
+  })
 }
 // 计算属性
 const totalAmount = computed(() => {