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

src/views/insurancePolicy/viewDetail.vue

@@ -192,6 +192,7 @@
 import api from '@/api'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from "element-plus";
+import { onMounted, onUnmounted } from 'vue'
 
 const myRoute = useRoute()
 const myRouter = useRouter()
@@ -228,6 +229,20 @@ onBeforeMount(() => {
     }
 })
 
+const handleEscKey = (event: KeyboardEvent) => {
+    if (event.key === 'Escape' || event.keyCode === 27) {
+        myRouter.back()
+    }
+}
+
+onMounted(() => {
+    window.addEventListener('keydown', handleEscKey)
+})
+
+onUnmounted(() => {
+    window.removeEventListener('keydown', handleEscKey)
+})
+
 </script>
 
 <style scoped lang="scss">
@@ -291,4 +306,4 @@ onBeforeMount(() => {
         width: 50%;
     }
 }
-</style>
+</style>

src/views/receivable/documentary/documentaryReport.vue

@@ -640,7 +640,17 @@ const handleExport = (type) => {
 
 const exportOtherSettlementExcel = () => {
   api.settlementApi.exportOtherSettlementExcel({
-
+    agreementType: '2',
+    settlementId: recordForm1.value.settlementId,
+    partnerCompanyId: recordForm1.value.partnerCompanyId,
+    invoiceParty: recordForm1.value.invoiceParty,
+    invoiceType: recordForm1.value.invoiceType,
+    status: recordForm1.value.status,
+    settlementPerson: recordForm1.value.settlementPerson,
+    invoiceId: recordForm1.value.invoiceId,
+    settlementTimeStart: recordForm1.value.settlementTime?.[0],
+    settlementTimeEnd: recordForm1.value.settlementTime?.[1],
+    invoiceTypes: ['2', '4']
   }).then((res: any) => {
     const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
     const fileName = '跟单费应收结算报表明细' + new Date().getTime() + '.xlsx';

src/views/receivable/handingFee/invoiceRecord.vue

@@ -78,7 +78,8 @@
       <el-table-column prop="settlementStatus" label="结算状态" width="120">
       </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="remainSettlementAmount" label="待结算金额" width="120"></el-table-column>
+      <el-table-column prop="settlementPaymentDifference" 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">