Просмотр исходного кода

查看详情 调整跟单费用展示为 业务员实际费用 费用详情 只有后线人员角色的人才可以看到

li.pengfei 2 лет назад
Родитель
Сommit
a760c846b9

+ 19 - 19
src/views/Letter/Letter.vue

@@ -1956,8 +1956,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ queryOrders.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="queryOrders.queryOrderFeeVo">
-            ¥{{queryOrders.queryOrderFeeVo.totalFeePremium?queryOrders.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;">
+            ¥{{queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.totalFeePremium?queryOrders.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom" >
           <div v-show="queryOrders.jqpremium">
@@ -1967,17 +1967,17 @@
               queryOrders.jqpremium }}
             </span>
           </div>
-          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                queryOrders.orderCommissionVo.jqFeeRate  }}%
             </span>
           </div>
-          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{queryOrders.orderCommissionVo.jqFeePremium}}
             </span>
           </div>
           <div v-show="queryOrders.taxamount">
@@ -1994,17 +1994,17 @@
             商业险金额:
             <span>¥{{ queryOrders.sypremium }}</span>
           </div>
-          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                queryOrders.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                queryOrders.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="queryOrders.orderCommissionVo&&queryOrders.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{queryOrders.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{queryOrders.orderCommissionVo.syFeePremium}}
             </span>
           </div>
           <div v-show="queryOrders.systartdate">
@@ -2225,7 +2225,7 @@
         </el-descriptions>
       </div>
 
-      <div class="Enclosure" v-if="queryOrders">
+      <div class="Enclosure" v-if="queryOrders&&feeDetailInfo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../src/icon/company.png" alt class="icon-img" />
@@ -2233,17 +2233,17 @@
           </div>
         </div>
         <div style="font-size:12px;width: 100%" class="FeeEnclosure">
-          <el-table :data="feeDetailInfo" :border="true" width="100%" :stripe="true" size="mini">
+          <el-table :data="feeDetailInfo"   :border="true"   width="100%"  :stripe="true" size="mini">
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
-            <el-table-column label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+            <el-table-column  label="交强险费用跟单明细" width="30%">
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
-            <el-table-column label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+            <el-table-column  label="商业险费用跟单明细" width="30%">
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
-            <el-table-column label="非车险费用跟单明细" width="30%">
+            <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
               <el-table-column prop="fcFeeAmount" label="金额" width="15%"></el-table-column>
             </el-table-column>

+ 3 - 4
src/views/Letter/Orderlist.vue

@@ -230,9 +230,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.orderCommissionVo">
-            ¥{{orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
-
+          <span style="color:#ff7612;">
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom" >
           <div v-show="orderInfo.jqpremium">
@@ -288,7 +287,7 @@
         </div>
       </div>
         <div class="headers headers_Custom" >
-          <div v-show="orderInfo.jypremium">
+          <div v-if="orderInfo.jypremium">
             驾意险:
             <span>¥{{ orderInfo.jypremium }}</span>
           </div>

+ 17 - 16
src/views/Task/Complete.vue

@@ -252,8 +252,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.queryOrderFeeVo">
-            ¥{{orderInfo.queryOrderFeeVo.totalFeePremium?orderInfo.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;" >
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
@@ -263,17 +263,17 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.taxamount">
@@ -290,17 +290,17 @@
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.systartdate">
@@ -489,7 +489,7 @@
           </div>
         </div>
       </div>
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="orderInfo&&feeDetailInfo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../src/icon/company.png" alt class="icon-img" />
@@ -500,12 +500,12 @@
           <el-table :data="feeDetailInfo"   :border="true"   width="100%"  :stripe="true" size="mini">
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
             <el-table-column  label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column  label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
@@ -1002,7 +1002,8 @@
           insureinfo: {},
           kindinfo: [],
           riskinfo: [],
-          ownerinfo: {}
+          ownerinfo: {},
+          orderCommissionVo:{},
         },
 
         carImageList: [],//车辆影像

+ 17 - 16
src/views/Task/OfflinePay.vue

@@ -256,8 +256,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.queryOrderFeeVo">
-            ¥{{orderInfo.queryOrderFeeVo.totalFeePremium?orderInfo.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;" >
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
@@ -267,17 +267,17 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.taxamount">
@@ -294,17 +294,17 @@
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.systartdate">
@@ -493,7 +493,7 @@
           </div>
         </div>
       </div>
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="orderInfo&&feeDetailInfo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../src/icon/company.png" alt class="icon-img" />
@@ -504,12 +504,12 @@
           <el-table :data="feeDetailInfo"   :border="true"   width="100%"  :stripe="true" size="mini">
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
             <el-table-column  label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column  label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
@@ -1007,7 +1007,8 @@ export default {
         insureinfo: {},
         kindinfo: [],
         riskinfo: [],
-        ownerinfo: {}
+        ownerinfo: {},
+        orderCommissionVo:{},
       },
 
       carImageList: [],//车辆影像

+ 17 - 16
src/views/Task/Quote.vue

@@ -256,8 +256,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.queryOrderFeeVo">
-            ¥{{orderInfo.queryOrderFeeVo.totalFeePremium?orderInfo.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;" >
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
@@ -267,17 +267,17 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.taxamount">
@@ -294,17 +294,17 @@
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.systartdate">
@@ -492,7 +492,7 @@
           </div>
         </div>
       </div>
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="orderInfo&&feeDetailInfo">
 
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
@@ -504,12 +504,12 @@
           <el-table :data="feeDetailInfo"   :border="true"   width="100%"  :stripe="true" size="mini">
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
             <el-table-column  label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column  label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
@@ -1006,7 +1006,8 @@
           insureinfo: {},
           kindinfo: [],
           riskinfo: [],
-          ownerinfo: {}
+          ownerinfo: {},
+          orderCommissionVo:{},
         },
 
         carImageList: [],//车辆影像

+ 17 - 17
src/views/Task/TaskpoolAll.vue

@@ -284,8 +284,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.queryOrderFeeVo">
-            ¥{{orderInfo.queryOrderFeeVo.totalFeePremium?orderInfo.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;" >
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
@@ -295,17 +295,17 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.taxamount">
@@ -322,17 +322,17 @@
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.systartdate">
@@ -527,7 +527,7 @@
           </div>
         </div>
                   </div>
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="orderInfo&&feeDetailInfo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../src/icon/company.png" alt class="icon-img" />
@@ -536,15 +536,14 @@
         </div>
         <div style="font-size:12px;width: 100%" class="FeeEnclosure">
           <el-table :data="feeDetailInfo"   :border="true"   width="100%"  :stripe="true" size="mini">
-
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
             <el-table-column  label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column  label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
@@ -1049,7 +1048,8 @@ export default {
         insureinfo: {},
         kindinfo: [],
         riskinfo: [],
-        ownerinfo: {}
+        ownerinfo: {},
+        orderCommissionVo:{},
       },
 
       carImageList: [],//车辆影像

+ 17 - 16
src/views/Task/Underwrite.vue

@@ -257,8 +257,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.queryOrderFeeVo">
-            ¥{{orderInfo.queryOrderFeeVo.totalFeePremium?orderInfo.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;" >
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
@@ -268,17 +268,17 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.taxamount">
@@ -295,17 +295,17 @@
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.systartdate">
@@ -510,7 +510,7 @@
         </div>
       </div>
   
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="orderInfo&&feeDetailInfo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../src/icon/company.png" alt class="icon-img" />
@@ -525,12 +525,12 @@
   
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
             <el-table-column  label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column  label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
@@ -1025,7 +1025,8 @@
 		  insureinfo: {},
 		  kindinfo: [],
 		  riskinfo: [],
-		  ownerinfo: {}
+		  ownerinfo: {},
+      orderCommissionVo:{},
 		},
   
 		carImageList: [],//车辆影像

+ 17 - 16
src/views/Task/UnderwriteBack.vue

@@ -257,8 +257,8 @@
           <span>总保费</span>
           <span style="color:#ff7612;">¥{{ orderInfo.sumpremium }}</span>
           <span style="padding-left: 20px">总费用</span>
-          <span style="color:#ff7612;" v-if="orderInfo.queryOrderFeeVo">
-            ¥{{orderInfo.queryOrderFeeVo.totalFeePremium?orderInfo.queryOrderFeeVo.totalFeePremium:0 }}</span>
+          <span style="color:#ff7612;" >
+            ¥{{orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.totalFeePremium?orderInfo.orderCommissionVo.totalFeePremium:0 }}</span>
         </div>
         <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
@@ -268,17 +268,17 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.jqFeeRate }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.jqFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.taxamount">
@@ -295,17 +295,17 @@
             商业险金额:
             <span>¥{{ orderInfo.sypremium }}</span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
             手续费比例:
             <span>
               {{
-                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+                orderInfo.orderCommissionVo.syFeeRate  }}%
             </span>
           </div>
-          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
             手续费金额:
             <span>
-              ¥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+              ¥{{orderInfo.orderCommissionVo.syFeePremium }}
             </span>
           </div>
           <div v-show="orderInfo.systartdate">
@@ -510,7 +510,7 @@
         </div>
       </div>
 
-      <div class="Enclosure" v-if="orderInfo">
+      <div class="Enclosure" v-if="orderInfo&&feeDetailInfo">
         <div class="home flex j-s a-c back">
           <div class="flex j-s a-c color">
             <img src="../../../src/icon/company.png" alt class="icon-img" />
@@ -525,12 +525,12 @@
 
             <el-table-column prop="feeTypeName" label="费用类型" width="10%"></el-table-column>
             <el-table-column  label="交强险费用跟单明细" width="30%">
-              <el-table-column prop="jqFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="jqFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="jqFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column  label="商业险费用跟单明细" width="30%">
-              <el-table-column prop="syFeeRate" label="比例" width="15%"></el-table-column>
-              <el-table-column prop="syFeeAmount" label="金额" width="15%"></el-table-column>
+              <el-table-column prop="syFeeRateAll" label="手续费比例/跟单费比例/总比例" width="15%"></el-table-column>
+              <el-table-column prop="syFeeAmountAll" label="手续费金额/跟单费金额/总金额" width="15%"></el-table-column>
             </el-table-column>
             <el-table-column   label="非车险费用跟单明细" width="30%">
               <el-table-column prop="fcFeeRate" label="比例" width="15%"></el-table-column>
@@ -1025,7 +1025,8 @@
           insureinfo: {},
           kindinfo: [],
           riskinfo: [],
-          ownerinfo: {}
+          ownerinfo: {},
+          orderCommissionVo:{},
         },
 
         carImageList: [],//车辆影像