修改小问题

oa-ui/src/api/oa/contract/contract.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-19 14:46:44
+ * @LastEditTime: 2024-12-20 09:37:59
  */
 import request from '@/utils/request'
 
@@ -48,10 +48,17 @@ export function delContract(contractId) {
     method: 'delete'
   })
 }
-
+// 合同统计
+export function getContractStatistic(query) {
+  return request({
+    url: '/oa/contract/statistic/',
+    method: 'get',
+    params: query
+  })
+}
 
 // 合同统计
-export function getContractStatistic(contractId) {
+export function getContractStatisticById(contractId) {
   return request({
     url: '/oa/contract/statistic/' + contractId,
     method: 'get',

oa-ui/src/views/contractStatistic/components/borrowStatistic.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-12-16 17:29:35
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-19 14:29:55
+ * @LastEditTime: 2024-12-19 16:51:05
 -->
 <template>
   <div>
@@ -118,8 +118,6 @@ export default {
       this.loading = false
     },
     rowClickFn(row) {
-      console.log(row);
-
       this.taskForm.formId = row.borrowId
       this.infoOpen = true;
     }

oa-ui/src/views/contractStatistic/components/budgetStatistic.vue

@@ -4,6 +4,7 @@
       预算列表
     </div>
     <el-table v-loading="loading" :data="budgetList" height="350px">
+      <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
       <el-table-column label="编制人" align="center" prop="compiler">
         <template slot-scope="scope">

oa-ui/src/views/contractStatistic/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-12-16 10:25:17
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-12-19 16:16:51
+ * @LastEditTime: 2024-12-20 10:37:08
 -->
 <template>
   <div class="app-container">
@@ -124,7 +124,7 @@
   </div>
 </template>
 <script>
-import { listContract, getContractStatisticSortByField, getContractStatistic } from "@/api/oa/contract/contract";
+import { listContract, getContractStatisticSortByField, getContractStatisticById } from "@/api/oa/contract/contract";
 import { listProjectContract } from "@/api/oa/contract/projectContract";
 import SubStatistic from './components/subStatistic.vue';
 import BorrowStatistic from "./components/borrowStatistic.vue";
@@ -179,6 +179,7 @@ export default {
         if (res.total != 0) {
           this.contract = this.contractList[0];
           this.getContractProject(this.contract.contractId);
+          this.getStatistic(this.contract.contractId);
         }
       })
     },
@@ -189,8 +190,11 @@ export default {
       this.loading = true
       this.status = 'sort'
       this.field = field
+      this.queryParams.pageNum = 1
+      this.queryInput = ''
       getContractStatisticSortByField({ field }).then(res => {
         let list = res.data.sort;
+        this.total = list.length;
         let a = list.slice((this.queryParams.pageNum - 1) * this.queryParams.pageSize, this.queryParams.pageNum * this.queryParams.pageSize);
         this.contractList = a;
         this.loading = false;
@@ -240,7 +244,7 @@ export default {
       }
     },
     getStatistic(contractId) {
-      getContractStatistic(contractId).then(res => {
+      getContractStatisticById(contractId).then(res => {
         this.subContractAmount = res.data.subAmount
         this.budgetSumAmount = res.data.budgetAmount
         this.borrowSumAmount = res.data.borrowAmount

oa-ui/src/views/statistics/components/borrowStatistics.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 17:20:59
+ * @LastEditTime: 2024-12-20 10:00:35
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -163,7 +163,7 @@ export default {
       let option = {
         title: {
           text: '各年借款金额',
-          subtext: '借款总额：' + Object.values(this.borrowAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元' +
+          subtext: '借款总额：' + (Object.values(this.borrowAmount).reduce((accumulator, currentValue) => { return accumulator + currentValue }, 0)).toFixed(2) + '元' +
             '（约' + this.sumBorrowAmount + '万元）'
         },
         grid: {

oa-ui/src/views/statistics/components/settleStatistics.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-10-18 11:17:48
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-25 17:20:49
+ * @LastEditTime: 2024-12-20 10:11:56
 -->
 <template>
   <div style="width:100%;" v-loading="loading">
@@ -169,7 +169,7 @@ export default {
       let option = {
         title: {
           text: '各年结算金额',
-          subtext: '结算总额：' + Object.values(this.settleAmount).reduce((accumulator, currentValue) => accumulator + currentValue, 0) + '元' +
+          subtext: '结算总额：' + (Object.values(this.settleAmount).reduce((accumulator, currentValue) => {return accumulator + currentValue}, 0)).toFixed(2) + '元' +
             '（约' + this.sumSettleAmount + '万元）'
         },
         grid: {