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

src/views/finance/modules/auditDetail.vue

@@ -181,6 +181,12 @@
               <span>{{ detailData?.costs?.sumPremium || '--' }}</span>
             </span>
           </el-col>
+          <el-col :span="6" class="TBMsgItem">
+            <span class="label">总金额（不含税）</span>
+            <span class="value">
+              <span>{{ detailData?.costs?.totalAmount || '--' }}</span>
+            </span>
+          </el-col>
           <el-col :span="6" class="TBMsgItem">
             <span class="label">是否过户车</span>
             <span class="value">

src/views/platform/platformReport.vue

@@ -56,7 +56,7 @@
           <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
           <el-table-column prop="totalSettlementAmount" label="已结算" width="200"></el-table-column>
           <el-table-column prop="totalUnSettlementAmount" label="未结算" width="200"></el-table-column>
-          <el-table-column prop="totalPaymentDifference" label="总差额" width="200"></el-table-column>
+          <el-table-column prop="totalPaymentDifference" label="回款差额" width="200"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <el-button link type="primary" @click="handleSettlementDetail(scope.row)">查看明细</el-button>
@@ -98,7 +98,7 @@
           <el-table-column prop="totalReceivable" label="应收总计" width="150"></el-table-column>
           <el-table-column prop="settledAmount" label="已结算总计" width="150"></el-table-column>
           <el-table-column prop="unSettledAmount" label="未结算总计" width="150"></el-table-column>
-          <el-table-column prop="totalPaymentDifference" label="总差额" width="200"></el-table-column>
+          <el-table-column prop="totalPaymentDifference" label="回款差额" width="200"></el-table-column>
 
         </el-table>
         <div class="pagination">

src/views/receivable/handingFee/invoiceRecord.vue

@@ -71,7 +71,15 @@
       <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
       <el-table-column prop="accountsReceivable" label="应收项" width="100"></el-table-column>
       <el-table-column prop="receivableAmount" label="应收手续费" width="120"></el-table-column>
-      <el-table-column prop="overinflatedAmount" label="虚增金额" width="120"></el-table-column>
+      <el-table-column prop="overinflatedAmount" label="虚增金额" width="120">
+        <template #default="scope">
+          <el-popover title="原因"  :content="scope.row.paymentReason" placement="top-start">
+            <template #reference>
+              {{ scope.row.overinflatedAmount }}
+            </template>
+          </el-popover>
+        </template>
+      </el-table-column>
       <el-table-column prop="paymentReason" label="差额原因" width="120"></el-table-column>
       <el-table-column prop="taxPoint" label="税点" width="120"></el-table-column>
       <el-table-column prop="receivableSupervisePremium" label="开票金额" width="120"></el-table-column>
@@ -79,7 +87,16 @@
       </el-table-column>
       <el-table-column prop="settlementAmount" label="已结算金额" width="120"></el-table-column>
       <el-table-column prop="remainSettlementAmount" label="待结算金额" width="120"></el-table-column>
-      <el-table-column prop="settlementPaymentDifference" label="回款差额" width="120"></el-table-column>
+      <el-table-column prop="settlementPaymentDifference" label="回款差额" width="120">
+        <template #default="scope">
+          <el-popover title="原因"  :content="scope.row.settlementPaymentReason" placement="top-start">
+            <template #reference>
+              {{ scope.row.settlementPaymentDifference }}
+            </template>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column prop="settlementPaymentReason" label="回款差额原因" width="120"></el-table-column>
       <el-table-column prop="createBy" label="开票人" width="120"></el-table-column>
       <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="300" fixed="right" align="center">
@@ -221,9 +238,9 @@ const reset = () => {
   initList()
 }
 const invoiceId = route.query.invoiceId
-  if(invoiceId){
-    form.value.recordId = invoiceId
-  }
+if (invoiceId) {
+  form.value.recordId = invoiceId
+}
 let countShow = ref(false)
 let countForm = ref({})
 let countRules = ref({