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

src/views/platform/ticket.vue

@@ -81,13 +81,7 @@
       <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例"></el-table-column>
       <el-table-column prop="syPremium" label="商业险保费"></el-table-column>
       <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例"></el-table-column>
-      <el-table-column label="应收金额">
-        <template #default="scope">
-          {{ scope.row.productId === '0330' || scope.row.productId === '0330034002' || scope.row.productId ===
-            '034002' ? scope.row.jqSuperviseCostsPremiums : scope.row.productId === '034001' || scope.row.productId ===
-              '0330034001' ? scope.row.sySuperviseCostsPremiums : '' }}
-        </template>
-      </el-table-column>
+      <el-table-column label="应收金额" prop="receivableAmount"></el-table-column>
     </el-table>
     <div class="footer">
       <el-button plain @click="handleBack">取消</el-button>

src/views/receivable/documentary/documentaryReport.vue

@@ -45,12 +45,8 @@
         <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">
-                                            <template #default>
-                                                展开
-                                            </template>
-</el-table-column>-->
           <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
+          <el-table-column prop="totalReconciliationAmount" 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>

src/views/receivable/documentary/ticket.vue

@@ -441,6 +441,8 @@ const handelComfirmEdit = () => {
     reconciliationAmount: editForm.value.reconciliationAmount,
     falselyIncreasedDifference: editForm.value.falselyIncreasedDifference,
     falselyIncreasedReason: editForm.value.falselyIncreasedReason,
+    invoiceType: route.query.invoiceType,
+
   }).then((res: any) => {
     if (res.code == 200) {
       ElMessage({