Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/receivable/documentary/documentaryReport.vue

@@ -43,7 +43,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
+        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id" :summary-method="getSummaries"
           show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <!--                    <el-table-column type="expand" label="合作保险公司" width="200">
@@ -51,12 +51,12 @@
                                                 展开
                                             </template>
 </el-table-column>-->
-          <el-table-column prop="totalReceivable" label="累计应收" width="240"></el-table-column>
-          <el-table-column prop="superviseFee" label="应收跟单费" width="240"></el-table-column>
-          <el-table-column prop="invoicedAmount" label="已开票" width="200"></el-table-column>
-          <el-table-column prop="settledAmount" label="已结算" width="200"></el-table-column>
-          <el-table-column prop="unInvoicedAmount" label="未开票" width="200"></el-table-column>
-          <el-table-column prop="unSettledAmount" label="未结算" width="200"></el-table-column>
+          <el-table-column prop="totalFollowFee" label="累计应收"></el-table-column>
+          <el-table-column prop="followFee" label="应收跟单费"></el-table-column>
+          <el-table-column prop="gdfInvoicedAmount" label="已开票"></el-table-column>
+          <el-table-column prop="gdfSettledAmount" label="已结算"></el-table-column>
+          <el-table-column prop="gdfUnInvoicedAmount" label="未开票"></el-table-column>
+          <el-table-column prop="gdfUnSettledAmount" label="未结算"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <el-button link type="primary">查看明细</el-button>

src/views/receivable/handingFee/report.vue

@@ -43,7 +43,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
+        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id" :summary-method="getSummaries"
           show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <!--                    <el-table-column type="expand" label="合作保险公司" width="200">
@@ -51,12 +51,12 @@
                             展开
                         </template>
 </el-table-column>-->
-          <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
-          <el-table-column prop="superviseFee" label="应收手续费" width="240"></el-table-column>
-          <el-table-column prop="invoicedAmount" label="已开票" width="200"></el-table-column>
-          <el-table-column prop="settledAmount" label="已结算" width="200"></el-table-column>
-          <el-table-column prop="unInvoicedAmount" label="未开票" width="200"></el-table-column>
-          <el-table-column prop="unSettledAmount" label="未结算" width="200"></el-table-column>
+          <el-table-column prop="totalReceivable" label="应收金额"></el-table-column>
+          <el-table-column prop="superviseFee" label="应收手续费"></el-table-column>
+          <el-table-column prop="sxfInvoicedAmount" label="已开票"></el-table-column>
+          <el-table-column prop="sxfSettledAmount" label="已结算"></el-table-column>
+          <el-table-column prop="sxfUnInvoicedAmount" label="未开票"></el-table-column>
+          <el-table-column prop="sxfUnSettledAmount" label="未结算"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <el-button link type="primary">查看明细</el-button>