Merge remote-tracking branch 'origin/dev' into dev

web/src/pinia/collection/Collection.js

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { reactive, ref } from 'vue'
-import { createCollection, deleteCollection, queryCollection, updateCollection, retrievalCollection } from '@/api/collection'
+import { createCollection, deleteCollection, queryCollection, updateCollection } from '@/api/collection'
 import { formatDate } from '@/utils/formatDate'
 
 export const collectionOperate = defineStore('payment', () => {
@@ -23,7 +23,6 @@ export const collectionOperate = defineStore('payment', () => {
         })
         paymentList.length = 0
         paymentList.push(...data)
-        console.log(paymentList)
       }
     })
   }
@@ -54,7 +53,6 @@ export const collectionOperate = defineStore('payment', () => {
     })
     paymentList.length = 0
     paymentList.push(...list)
-    paymentTotal.value = list.length
   }
   const changePaymentCode = (code) => {
     paymentCode.value = code

web/src/view/finance/components/payment.vue

@@ -107,7 +107,7 @@
             layout="prev, pager, next"
             :page-size="8"
             :total="pay.paymentTotal"
-            @change=""
+            @change="changePaymentPage"
           />
         </el-row>
       </el-col>
@@ -314,7 +314,6 @@ const paymentDelete = (row) => {
       })
     }).catch(() => {})
 }
-
 const searchCollection = () => {
   condition.code = pay.paymentCode
   retrievalCollection(condition).then(res => {
@@ -324,7 +323,6 @@ const searchCollection = () => {
     }
   })
 }
-
 const paymentAdd = () => {
   const addData = paymentAddData
   addData.price = addAmount.value.length === 0 ? 0 : parseFloat(addAmount.value)
@@ -363,6 +361,9 @@ const paymentAdd = () => {
     }
   })
 }
+const changePaymentPage = (page) => {
+  console.log(page)
+}
 
 </script>
 

web/src/view/finance/financeAnalysis/financeAnalysis.vue

@@ -310,6 +310,7 @@ const projectList = (condition) => {
         if (res.code === 0) {
           console.log(res.data)
           payment.changePaymentList(res.data.collection)
+          payment.changePaymentTotal(res.data.collectionTotal)
         }
       })
       getProjectMessage(list[0].code).then(res => {