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

src/views/platform/platformRecord.vue

@@ -65,8 +65,10 @@
       <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
       <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
       <el-table-column prop="invoiceType" label="应收项" width="200"></el-table-column>
-      <el-table-column prop="taxPoint" label="税点" width="100"></el-table-column>
+      <el-table-column prop="receivableSupervisePremium" label="应收金额" width="150"></el-table-column>
       <el-table-column prop="actualReceivedAmount" label="实收金额" width="150"></el-table-column>
+      <el-table-column prop="settlementPaymentDifference" label="回款差额" width="150"></el-table-column>
+      <el-table-column prop="settlementPaymentReason" label="差额原因" width="150"></el-table-column>
       <el-table-column prop="receivePaymentDate" label="收款日期" width="200"></el-table-column>
       <el-table-column label="收款凭证" width="100">
         <template #default="scope">

src/views/receivable/documentary/index.vue

@@ -355,7 +355,7 @@
               {{ Number(scope.row.jyPremium) || ' ' }}
             </template>
           </el-table-column>
-          <!--                    <el-table-column prop="a" label="非车险不含税保费" width="100"></el-table-column>-->
+          <el-table-column prop="jyOtherCostsPremiums" label="非车跟单费" width="100"></el-table-column>
           <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="100">
             <template #default="scope">
               {{ Number(scope.row.jyOtherCostsProportion) || ' ' }}
@@ -481,14 +481,14 @@
             <el-row :gutter="20">
               <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="交强险跟单费比例">
-                  <el-input v-model="editForm.jqInsurance">
+                  <el-input v-model="editForm.jqOtherCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="商业险跟单费比例">
-                  <el-input v-model="editForm.syInsurance">
+                  <el-input v-model="editForm.syOtherCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
@@ -505,7 +505,7 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="">
-                  <el-date-picker v-model="editForm.signTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+                  <el-date-picker v-model="editForm.signingTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
                 </el-form-item>
               </el-col>
@@ -514,12 +514,12 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="姓名">
-                  <el-input v-model="editForm.name"></el-input>
+                  <el-input v-model="editForm.contractUserName"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="手机号">
-                  <el-input v-model="editForm.phone"></el-input>
+                  <el-input v-model="editForm.contractPhone"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -921,11 +921,7 @@ const handleBatchEdit = () => {
 const handleBatchEditSubmit = async () => {
   const params = {
     incomeIds: selectedList.value.map(item => item.id),
-    jqOtherCostsProportion: editForm.value.jqInsurance,
-    syOtherCostsProportion: editForm.value.syInsurance,
-    signingTime: editForm.value.signTime,
-    contractUserName: editForm.value.name,
-    contractPhone: editForm.value.phone,
+    ...editForm.value,
     updateFlag: '2'
   }
   const { code, data, msg } = await api.financeApi.batchModify(params)

src/views/receivable/handingFee/index.vue

@@ -477,14 +477,14 @@
             <el-row :gutter="20">
               <el-col :span="12"  v-if="activeName === '1'">
                 <el-form-item label="交强险手续费比例">
-                  <el-input v-model="editForm.jqInsurance">
+                  <el-input v-model="editForm.jqSuperviseCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12"  v-if="activeName === '1'">
                 <el-form-item label="商业险手续费比例">
-                  <el-input v-model="editForm.syInsurance">
+                  <el-input v-model="editForm.sySuperviseCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
@@ -502,7 +502,7 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="">
-                  <el-date-picker v-model="editForm.signTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+                  <el-date-picker v-model="editForm.signingTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
                 </el-form-item>
               </el-col>
@@ -511,12 +511,12 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="姓名">
-                  <el-input v-model="editForm.name"></el-input>
+                  <el-input v-model="editForm.contractUserName"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="手机号">
-                  <el-input v-model="editForm.phone"></el-input>
+                  <el-input v-model="editForm.contractPhone"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -910,11 +910,7 @@ const handleBatchEdit = () => {
 const handleBatchEditSubmit = async () => {
   const params = {
     incomeIds: selectedList.value.map(item => item.id),
-    jqSuperviseCostsProportion: editForm.value.jqInsurance,
-    sySuperviseCostsProportion: editForm.value.syInsurance,
-    signingTime: editForm.value.signTime,
-    contractUserName: editForm.value.name,
-    contractPhone: editForm.value.phone,
+    ...editForm.value,
     updateFlag: '1'
   }
   const { code, data, msg } = await api.financeApi.batchModify(params)