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

src/api/modules/finance.ts

@@ -142,6 +142,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
 
     // 私有-开票-标识结清
     updateSettlementStatus: (data: any) => axiosInstance.post(`/receivable/updateSettlementStatus?id=${data}`), // 标识结清
+
+    settlementPaymentDifference: (data: any) => axiosInstance.post(`/followReconciliation/saveOrUpdate`,data),
 })
 
 export default financeApi

src/views/receivable/documentary/documentaryRecord.vue

@@ -92,8 +92,6 @@
                 <el-dropdown-menu>
                   <el-dropdown-item
                     @click="handleCountRecord(scope.row)">结算记录</el-dropdown-item>
-                  <el-dropdown-item
-                    @click="handleInvoiceDetail(scope.row)">开票明细</el-dropdown-item>
                 </el-dropdown-menu>
               </template>
             </el-dropdown>

src/views/receivable/documentary/documentaryReport.vue

@@ -51,13 +51,12 @@
                                             </template>
 </el-table-column>-->
           <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
-          <el-table-column prop="followFee" label="应收跟单费"></el-table-column>
           <el-table-column prop="year" label="年"></el-table-column>
           <el-table-column prop="month" label="月"></el-table-column>
           <el-table-column prop="totalInvoiced" label="已开票"></el-table-column>
           <el-table-column prop="totalSettlementAmount" label="已结算"></el-table-column>
-          <el-table-column prop="totalUnInvoiced" label="未开票"></el-table-column>
           <el-table-column prop="totalUnSettlementAmount" label="未结算"></el-table-column>
+          <el-table-column prop="totalUnInvoiced" label="未开票"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <div class="flex a-c">

src/views/receivable/documentary/ticket.vue

@@ -433,6 +433,23 @@ const handelComfirmEdit = () => {
   tableData.value[rowIndex.value].falselyIncreasedDifference = editForm.value.falselyIncreasedDifference
   tableData.value[rowIndex.value].falselyIncreasedReason = editForm.value.falselyIncreasedReason
   editShow.value = false
+  api.financeApi.settlementPaymentDifference({
+    partnerCompanyId: editForm.value.partnerCompanyId,
+    partnerCompanyId: editForm.value.partnerCompanyId,
+    year: editForm.value.year,
+    month: editForm.value.month,
+    reconciliationAmount: editForm.value.reconciliationAmount,
+    falselyIncreasedDifference: editForm.value.falselyIncreasedDifference,
+    falselyIncreasedReason: editForm.value.falselyIncreasedReason,
+  }).then((res: any) => {
+    if (res.code == 200) {
+      ElMessage({
+        message: res.msg,
+        type: 'success'
+      })
+      initData()
+    }
+  })
 }
 onMounted(() => {
   initData()

src/views/receivable/handingFee/report.vue

@@ -66,6 +66,7 @@
           <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 prop="settlementPaymentDifference" label="回款差额合计"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <div class="flex a-c">

src/views/receivable/handingFee/ticket.vue

@@ -568,7 +568,7 @@ const calBeforeInvoice = async (params: any) => {
   if (res.code == 200) {
     openCountForm()
     countForm.value.invoiceTime = res.data.invoiceTime
-    countForm.value.receivableSupervisePremium = res.data.receivableSupervisePremium
+    // countForm.value.receivableSupervisePremium = res.data.receivableSupervisePremium
     receivableSupervisePremium.value = res.data.receivableSupervisePremium
   }
 }