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

src/views/additionalOrder/order/index.vue

@@ -457,7 +457,9 @@ const initData = (type) => {
     salesmanCompany: form.value.salesmanCompany,
     companyId: form.value.companyId,
     licenseNo: form.value.licenseNo,
-    recordingTime: form.value.recordingTime
+    recordingTime: form.value.recordingTime,
+    entryStatus:'3',
+    createBy: JSON.parse(localStorage.getItem("userInfo")).username,
   }).then((res: any) => {
     if (res.code == 200) {
       switch (type) {

src/views/receivable/documentary/documentaryReport.vue

@@ -50,8 +50,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id"
-          :summary-method="val => getSummaries(val, ['settlementPaymentDifference'])" show-summary>
+        <el-table height="500px" :data="recordData" row-key="id"
+          :summary-method="val => getSummaries(val, ['totalSettlementAmount'])" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
           <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>