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

src/views/receivable/documentary/index.vue

@@ -166,12 +166,10 @@
           <el-table-column prop="productName" label="险种" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
-          <!--                    <el-table-column prop="a" label="交强险不含税保费" width="100"></el-table-column>-->
           <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
-          <el-table-column prop="jqSuperviseCostsProportion" label="交强险跟单费比例" width="100"></el-table-column>
+          <el-table-column prop="jqOtherCostsProportion" label="交强险跟单费比例" width="100"></el-table-column>
           <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
-          <!--                    <el-table-column prop="a" label="商业险不含税保费" width="100"></el-table-column>-->
-          <el-table-column prop="sySuperviseCostsProportion" label="商业险跟单费比例" width="100"></el-table-column>
+          <el-table-column prop="syOtherCostsProportion" label="商业险跟单费比例" width="100"></el-table-column>
           <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>
           <el-table-column prop="syPolicyNo" label="商业险保单号" width="150"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
@@ -347,7 +345,7 @@
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>
           <!--                    <el-table-column prop="a" label="非车险不含税保费" width="100"></el-table-column>-->
-          <el-table-column prop="jySuperviseCostsProportion" label="非车险跟单费比例" width="100"></el-table-column>
+          <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="100"></el-table-column>
           <el-table-column prop="jyPolicyNo" label="非车险保单号" width="100"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
           <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>