承接合同和分包合同列表新增回款、付款金额

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-13 09:56:22
+ * @LastEditTime: 2025-02-17 15:12:03
 -->
 <template>
   <div class="app-container">
@@ -71,6 +71,9 @@
         <template slot-scope="scope">
           <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
             :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+            <div>
+              {{scope.row.paidAmount}}
+            </div>
         </template>
       </el-table-column>
       <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
@@ -206,7 +209,9 @@ export default {
           listContractPaid({ contractId: contract.contractId }).then(res => {
             if (res.total > 0) {
               let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
+              let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
               this.$set(contract, 'percentage', Number(percentage.toFixed(2)))
+              this.$set(contract, 'paidAmount', Number(paidAmount.toFixed(2)))
             } else {
               this.$set(contract, 'percentage', 0)
             }

oa-ui/src/views/oa/contract/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-14 15:25:53
+ * @LastEditTime: 2025-02-17 15:15:23
 -->
 <template>
   <div class="app-container">
@@ -56,7 +56,7 @@
             {{ getFileName(scope.row.contractDocument) }}
           </el-link>
         </template>
-      </el-table-column> -->
+</el-table-column> -->
       <el-table-column label="拟稿日期" align="center" prop="draftTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
@@ -72,6 +72,9 @@
         <template slot-scope="scope">
           <el-progress :text-inside="true" :stroke-width="26" :status="formatStatus(scope.row.percentage)"
             :percentage="scope.row.percentage" text-color="#fff"></el-progress>
+          <div>
+            {{ scope.row.paidAmount }}
+          </div>
         </template>
       </el-table-column>
       <!-- <el-table-column label="签订备注" align="center" prop="signRemark" /> -->
@@ -118,7 +121,7 @@
     <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="60%">
       <sub-contract :taskForm="taskForm" :taskName="''" :flowDisabled="false"></sub-contract>
     </el-dialog>
-    
+
     <!-- 回款进度 -->
     <el-dialog :title="title" :visible.sync="progressOpen" width="50%" append-to-body>
       <sub-progress :form="progressContract" @cancel="progressOpen = false" @getList="getList"></sub-progress>
@@ -210,7 +213,9 @@ export default {
           listContractPaid({ contractId: subContract.subContractId }).then(res => {
             if (res.total > 0) {
               let percentage = res.rows.reduce((sum, item) => sum + Number(item.paidPercentage), 0);
-              this.$set(subContract, 'percentage', Number(percentage.toFixed(2)))
+              let paidAmount = res.rows.reduce((sum, item) => sum + Number(item.paidAmount), 0);
+              this.$set(subContract, 'percentage', Number(percentage.toFixed(2)));
+              this.$set(subContract, 'paidAmount', Number(paidAmount.toFixed(2)));
             } else {
               this.$set(subContract, 'percentage', 0)
             }