Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -224,6 +224,7 @@
             </el-checkbox-group>
           </div>
           <div>
+            <el-collapse  accordion>
             <div class="flex   f-c products" v-for="(schemeitem, schemeindex) in costform.scheme" :key="schemeindex">
               <div class="productstitle flex j-s">
                 <div><span>{{ schemeitem.name }}费用</span></div>
@@ -246,14 +247,17 @@
                 </div>
                 <el-form ref="costform" :model="productCostsitem" label-width="130px" :size="overSize"
                   :rules="costformRules">
+                  <el-collapse-item   style="padding-top: 50px;">
+                    <template slot="title">
+                      <el-col :span="20" :offset="2" >
+                        <el-form-item label="费用描述">
+                          <el-input type="textarea" v-model="productCostsitem.costsDescription"
+                                    placeholder="输入费用描述内容"></el-input>
+                        </el-form-item>
+                      </el-col>
+                    </template>
                   <el-row>
                     <h4/>
-                    <el-col :span="20" :offset="2">
-                      <el-form-item label="费用描述">
-                        <el-input type="textarea" v-model="productCostsitem.costsDescription"
-                                  placeholder="输入费用描述内容"></el-input>
-                      </el-form-item>
-                    </el-col>
                     <el-col :span="10" :offset="2">
                       <el-form-item label="费用起期" prop="costsStartDate">
                         <el-date-picker style="width: 100%;" v-model="productCostsitem.costsStartDate" type="datetime"
@@ -273,6 +277,7 @@
                         <el-input style="width: 100%" v-model="productCostsitem.priorityLevel"   @change="vm=> changePriorityLevel(vm,schemeindex,productCostsindex)"   label="方案匹配优先级"></el-input>
                       </el-form-item>
                     </el-col>
+
                   </el-row>
                   <el-row v-if="['单交', '交三', '交商','兜底配置'].includes(schemeitem.name)">
                     <h4 style="color: tomato;">交强险费用</h4>
@@ -357,9 +362,11 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
+                  </el-collapse-item>
                 </el-form>
               </div>
             </div>
+            </el-collapse>
           </div>
         </el-tab-pane>
         <el-tab-pane label="非车产品费用" name="Noncarproductcost" style="padding: 20px;">

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -62,34 +62,6 @@
     <el-table size="small" :data="pageResult" height="590" border v-loading="loading" highlight-current-row stripe
        @expand-change="handleRowChange" ref="expandTable"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
-      <el-table-column type="expand">
-        <template slot-scope="scope">
-          <div class="demo-table-expand flex a-c  j-s" :style="{ width: width, flexWrap: 'wrap' }"
-            v-for="(item, index) in scope.row.insAreaCompanyList" :key="index">
-            <div style="width: 200px;">{{ item.inscompany }} <span style="color:#ee7000;">（{{item.agreementName}}）</span> </div>
-            <div class="flex a-c j-s demo-table-expand-time">
-              <div>总价： <span style="color:#ee7000;">{{ item.sumpremium }}</span></div>
-              <div>交强险：<span style="color:#ee7000;">{{ item.jqpremium }}</span> </div>
-              <div>商业险：<span style="color:#ee7000;">{{ item.sypremium }}</span></div>
-              <div>车船税：<span style="color:#ee7000;">{{ item.taxamount }}</span></div>
-              <div v-if="item.jypremium">驾意险：<span style="color:#ee7000;">{{ item.jypremium }}</span></div>
-              <div>{{ item.createtime }}</div>
-            </div>
-            <div slot="reference" class="name-wrapper flex a-c j-c" style="margin:0 20px; width: 100px;">
-
-              <el-tag v-if="item.orderstatus == '0'" type="success" size="medium">报价中</el-tag>
-              <el-tag v-if="item.orderstatus == '1'" type="warning" size="medium">待核保</el-tag>
-              <el-tag v-if="item.orderstatus == '2'" type="danger" size="medium">已核保待缴费</el-tag>
-              <el-tag v-if="item.orderstatus == '3'" type="danger" size="medium">已承保</el-tag>
-              <el-tag v-if="item.orderstatus == '4'" type="danger" size="medium">核保退回</el-tag>
-            </div>
-            <div style="width: 220px;" class="flex a-c j-end">
-              <el-button size="mini" type="text" @click="OrderDetails(scope.row, item)">查看详情
-              </el-button>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column prop="orderno" label="订单号"  align="center"></el-table-column>
       <el-table-column prop="username" label="业务员" align="center">
         <template slot-scope="scope">
@@ -116,6 +88,10 @@
 
       <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
       <el-table-column label="操作" align="center" min-width="100" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="OrderDetails(scope.row, item)">查看详情
+          </el-button>
+        </template>
       </el-table-column>
     </el-table>
     <!-- 分页功能 -->
@@ -365,12 +341,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>
@@ -544,7 +520,7 @@ export default {
     //应用详情
     OrderDetails(dy, item) {
       let params = {
-        orderNo: item.orderno,
+        orderNo: dy.orderno,
       }
       this.$api.task.feeDetail(params).then((res) => {
         if (res.code == 200) {

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -64,34 +64,6 @@
     <el-table size="small" :data="pageResult" height="590" border v-loading="loading" highlight-current-row stripe
        @expand-change="handleRowChange" ref="expandTable"
       :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }">
-      <el-table-column type="expand">
-        <template slot-scope="scope">
-          <div class="demo-table-expand flex a-c  j-s" :style="{ width: width, flexWrap: 'wrap' }"
-            v-for="(item, index) in scope.row.insAreaCompanyList" :key="index">
-            <div style="width: 200px;">{{ item.inscompany }} <span style="color:#ee7000;">（{{item.agreementName}}）</span> </div>
-            <div class="flex a-c j-s demo-table-expand-time">
-              <div>总价： <span style="color:#ee7000;">{{ item.sumpremium }}</span></div>
-              <div>交强险：<span style="color:#ee7000;">{{ item.jqpremium }}</span> </div>
-              <div>商业险：<span style="color:#ee7000;">{{ item.sypremium }}</span></div>
-              <div>车船税：<span style="color:#ee7000;">{{ item.taxamount }}</span></div>
-              <div v-if="item.jypremium">驾意险：<span style="color:#ee7000;">{{ item.jypremium }}</span></div>
-              <div>{{ item.createtime }}</div>
-            </div>
-            <div slot="reference" class="name-wrapper flex a-c j-c" style="margin:0 20px; width: 100px;">
-
-              <el-tag v-if="item.orderstatus == '0'" type="success" size="medium">报价中</el-tag>
-              <el-tag v-if="item.orderstatus == '1'" type="warning" size="medium">待核保</el-tag>
-              <el-tag v-if="item.orderstatus == '2'" type="danger" size="medium">已核保待缴费</el-tag>
-              <el-tag v-if="item.orderstatus == '3'" type="danger" size="medium">已承保</el-tag>
-              <el-tag v-if="item.orderstatus == '4'" type="danger" size="medium">核保退回</el-tag>
-            </div>
-            <div style="width: 220px;" class="flex a-c j-end">
-              <el-button size="mini" type="text" @click="OrderDetails(scope.row, item)">查看详情
-              </el-button>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column prop="orderno" label="订单号"  align="center"></el-table-column>
       <el-table-column prop="username" label="业务员" align="center">
         <template slot-scope="scope">
@@ -118,6 +90,10 @@
 
       <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
       <el-table-column label="操作" align="center" min-width="100" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="OrderDetails(scope.row, item)">审核
+          </el-button>
+        </template>
       </el-table-column>
     </el-table>
     <!-- 分页功能 -->
@@ -367,12 +343,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>
@@ -560,7 +536,7 @@ export default {
     //应用详情
     OrderDetails(dy, item) {
       let params = {
-        orderNo: item.orderno,
+        orderNo: dy.orderno,
       }
       this.$api.task.feeDetail(params).then((res) => {
         console.log(res)

src/views/Letter/Letter.vue

@@ -1955,8 +1955,11 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom" >
           <div v-show="queryOrders.jqpremium">
             交强险金额：
             <span>
@@ -1964,27 +1967,57 @@
               queryOrders.jqpremium }}
             </span>
           </div>
-          <div v-show="queryOrders.sypremium">
-            商业险金额：
-            <span>￥{{ queryOrders.sypremium }}</span>
+          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo&&queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{queryOrders.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+            </span>
           </div>
           <div v-show="queryOrders.taxamount">
             车船税：
             <span>￥{{ queryOrders.taxamount }}</span>
           </div>
-          <div v-if="queryOrders.jypremium">
-            驾意险：
-            <span>￥{{ queryOrders.jypremium }}</span>
-          </div>
           <div v-show="queryOrders.jqstartdate">
             交强险起保日期：
             <span>{{ queryOrders.jqstartdate }}</span>
           </div>
+        </div>
+        <div class="headers headers_Custom" >
+          <div v-show="queryOrders.sypremium">
+            商业险金额：
+            <span>￥{{ queryOrders.sypremium }}</span>
+          </div>
+          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                queryOrders.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="queryOrders.queryOrderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo&&queryOrders.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{queryOrders.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+            </span>
+          </div>
           <div v-show="queryOrders.systartdate">
             商业险起保日期：
             <span>{{ queryOrders.systartdate }}</span>
           </div>
         </div>
+        <div class="headers headers_Custom" >
+          <div v-if="queryOrders.jypremium">
+            驾意险：
+            <span>￥{{ queryOrders.jypremium }}</span>
+          </div>
+        </div>
       </div>
       <div class="Enclosure" v-if="queryOrders">
         <div class="home flex j-s a-c back">
@@ -8961,7 +8994,7 @@ export default {
 /* 内容待定 */
 .headers_Custom {
   div {
-    padding: 20px 40px;
+    padding: 5px 40px;
     font-size: 16px;
 
     & > span {

src/views/Letter/Orderlist.vue

@@ -229,8 +229,12 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
+
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom" >
           <div v-show="orderInfo.jqpremium">
             交强险金额：
             <span>
@@ -238,25 +242,55 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-show="orderInfo.sypremium">
-            商业险金额：
-            <span>￥{{ orderInfo.sypremium }}</span>
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeeRate">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.orderCommissionVo.jqFeeRate  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.jqFeePremium">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.orderCommissionVo.jqFeePremium }}
+            </span>
           </div>
           <div v-show="orderInfo.taxamount">
             车船税：
             <span>￥{{ orderInfo.taxamount }}</span>
           </div>
-          <div v-if="orderInfo.accidentInfo">
-            驾意险：
-            <span>￥{{ orderInfo.jypremium }}</span>
-          </div>
           <div v-show="orderInfo.jqstartdate">
             交强险起保日期：
             <span>{{ orderInfo.jqstartdate }}</span>
           </div>
-          <div v-show="orderInfo.systartdate">
-            商业险起保日期：
-            <span>{{ orderInfo.systartdate }}</span>
+        </div>
+        <div class="headers headers_Custom" >
+        <div v-show="orderInfo.sypremium">
+          商业险金额：
+          <span>￥{{ orderInfo.sypremium }}</span>
+        </div>
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeeRate">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.orderCommissionVo.syFeeRate  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.orderCommissionVo&&orderInfo.orderCommissionVo.syFeePremium">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.orderCommissionVo.syFeePremium }}
+            </span>
+          </div>
+        <div v-show="orderInfo.systartdate">
+          商业险起保日期：
+          <span>{{ orderInfo.systartdate }}</span>
+        </div>
+      </div>
+        <div class="headers headers_Custom" >
+          <div v-show="orderInfo.jypremium">
+            驾意险：
+            <span>￥{{ orderInfo.jypremium }}</span>
           </div>
         </div>
       </div>
@@ -269,11 +303,11 @@
         </div>
         <el-descriptions size="small">
           <el-descriptions-item label="评分">{{ orderInfo.extendInfo.score }}</el-descriptions-item>
-          <el-descriptions-item label="交强类型评分">{{ queryOrders.extendInfo.jqScore }}</el-descriptions-item>
-          <el-descriptions-item label="商业类型评分">{{ queryOrders.extendInfo.syScore }}</el-descriptions-item>
-          <el-descriptions-item label="总赔付率">{{ queryOrders.extendInfo.lossRation }}</el-descriptions-item>
-          <el-descriptions-item label="交强赔付率">{{ queryOrders.extendInfo.jgLossRation }}</el-descriptions-item>
-          <el-descriptions-item label="商业赔付率">{{ queryOrders.extendInfo.syLossRation }}</el-descriptions-item>
+          <el-descriptions-item label="交强类型评分">{{ orderInfo.extendInfo.jqScore }}</el-descriptions-item>
+          <el-descriptions-item label="商业类型评分">{{ orderInfo.extendInfo.syScore }}</el-descriptions-item>
+          <el-descriptions-item label="总赔付率">{{ orderInfo.extendInfo.lossRation }}</el-descriptions-item>
+          <el-descriptions-item label="交强赔付率">{{ orderInfo.extendInfo.jgLossRation }}</el-descriptions-item>
+          <el-descriptions-item label="商业赔付率">{{ orderInfo.extendInfo.syLossRation }}</el-descriptions-item>
           <el-descriptions-item label="出险信息">{{ orderInfo.extendInfo.accidentInfoStr }}</el-descriptions-item>
           <el-descriptions-item label="商业险折扣比例">{{ orderInfo.extendInfo.nirrratio }}</el-descriptions-item>
           <el-descriptions-item label="交强险折扣比例">{{ orderInfo.extendInfo.nirrratioCI }}</el-descriptions-item>
@@ -778,6 +812,7 @@ export default {
         kindinfo: [],
         riskinfo: [],
         ownerinfo: {},
+        orderCommissionVo:{},
       },
       carImageList: [], //车辆影像
       ownerImageList: [], //车主影像
@@ -2576,7 +2611,7 @@ export default {
 }
 /* 内容待定 */
 .headers_Custom >div{
-  padding: 20px 40px;
+  padding: 5px 40px;
   font-size: 16px;
 }
 .headers_Custom >div>span {

src/views/Task/Complete.vue

@@ -69,6 +69,13 @@
               <el-input clearable placeholder="受理人工号" v-model="queryForm.auditId"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="保险公司">
+              <el-select v-model="queryForm.insCompany" filterable  class="widths" clearable>
+                <el-option v-for="val in companyList" :key='val.id' :label="val.name" :value="val.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" style="height: 40px;">
             <el-form-item label="报价时间">
               <el-date-picker v-model="queryForm.quoteDate" style="width:100%" type="daterange" align="left"
@@ -244,8 +251,11 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
             交强险金额：
             <span>
@@ -253,27 +263,57 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-show="orderInfo.sypremium">
-            商业险金额：
-            <span>￥{{ orderInfo.sypremium }}</span>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+            </span>
           </div>
           <div v-show="orderInfo.taxamount">
             车船税：
             <span>￥{{ orderInfo.taxamount }}</span>
           </div>
-          <div v-if="orderInfo.accidentInfo">
-            驾意险：
-            <span>￥{{ orderInfo.jypremium }}</span>
-          </div>
           <div v-show="orderInfo.jqstartdate">
             交强险起保日期：
             <span>{{ orderInfo.jqstartdate }}</span>
           </div>
+        </div>
+        <div class="headers headers_Custom" >
+          <div v-show="orderInfo.sypremium">
+            商业险金额：
+            <span>￥{{ orderInfo.sypremium }}</span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+            </span>
+          </div>
           <div v-show="orderInfo.systartdate">
             商业险起保日期：
             <span>{{ orderInfo.systartdate }}</span>
           </div>
         </div>
+        <div class="headers headers_Custom" >
+          <div v-if="orderInfo.jypremium">
+            驾意险：
+            <span>￥{{ orderInfo.jypremium }}</span>
+          </div>
+        </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
         <div class="home flex j-s a-c back">
@@ -1006,6 +1046,7 @@
           "editId": "",
           "pageNum": 1,
           "pageSize": 20,
+          "insCompany":""
         },
 
         sendBackDialogVisible: false,//控制退回修改弹框
@@ -1052,10 +1093,13 @@
         systartdate: "",//商业时间
         mobile: "",//投保人手机号
         paycodeimg: "",//展示二维码
-
+        companyList:[], //保险公司
       }
     },
     created() {
+      this.$api.letter.gainTopList().then(res=>{
+        this.companyList=res.data
+      })
       this.peopleid = Cookies.get('user');
       if (this.peopleid != 'admin') {
         this.peopledeptid = Cookies.get('user').split('D')[0];
@@ -2639,7 +2683,7 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 20px 40px;
+      padding: 5px 30px;
       font-size: 16px;
 
       &>span {

src/views/Task/OfflinePay.vue

@@ -69,6 +69,13 @@
               <el-input clearable placeholder="受理人工号" v-model="queryForm.auditId"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="保险公司">
+              <el-select v-model="queryForm.insCompany" filterable  class="widths" clearable>
+                <el-option v-for="val in companyList" :key='val.id' :label="val.name" :value="val.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" style="height: 40px;">
             <el-form-item label="报价时间">
               <el-date-picker v-model="queryForm.quoteDate" style="width:100%" type="daterange" align="left"
@@ -248,8 +255,11 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
             交强险金额：
             <span>
@@ -257,27 +267,57 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-show="orderInfo.sypremium">
-            商业险金额：
-            <span>￥{{ orderInfo.sypremium }}</span>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+            </span>
           </div>
           <div v-show="orderInfo.taxamount">
             车船税：
             <span>￥{{ orderInfo.taxamount }}</span>
           </div>
-          <div v-if="orderInfo.accidentInfo">
-            驾意险：
-            <span>￥{{ orderInfo.jypremium }}</span>
-          </div>
           <div v-show="orderInfo.jqstartdate">
             交强险起保日期：
             <span>{{ orderInfo.jqstartdate }}</span>
           </div>
+        </div>
+        <div class="headers headers_Custom" >
+          <div v-show="orderInfo.sypremium">
+            商业险金额：
+            <span>￥{{ orderInfo.sypremium }}</span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+            </span>
+          </div>
           <div v-show="orderInfo.systartdate">
             商业险起保日期：
             <span>{{ orderInfo.systartdate }}</span>
           </div>
         </div>
+        <div class="headers headers_Custom" >
+          <div v-if="orderInfo.jypremium">
+            驾意险：
+            <span>￥{{ orderInfo.jypremium }}</span>
+          </div>
+        </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
         <div class="home flex j-s a-c back">
@@ -1011,6 +1051,7 @@ export default {
         "editId": "",
         "pageNum": 1,
         "pageSize": 20,
+          "insCompany":""
       },
 
       sendBackDialogVisible: false,//控制退回修改弹框
@@ -1057,10 +1098,13 @@ export default {
       systartdate: "",//商业时间
       mobile: "",//投保人手机号
       paycodeimg: "",//展示二维码
-
+        companyList:[], //保险公司
     }
   },
   created() {
+      this.$api.letter.gainTopList().then(res=>{
+        this.companyList=res.data
+      })
     this.peopleid = Cookies.get('user');
     if (this.peopleid != 'admin') {
       this.peopledeptid = Cookies.get('user').split('D')[0];
@@ -2647,7 +2691,7 @@ export default {
 /* 内容待定 */
 .headers_Custom {
   div {
-    padding: 20px 40px;
+      padding: 5px 30px;
     font-size: 16px;
 
     &>span {

src/views/Task/Quote.vue

@@ -69,6 +69,13 @@
               <el-input clearable placeholder="受理人工号" v-model="queryForm.auditId"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="保险公司">
+              <el-select v-model="queryForm.insCompany" filterable  class="widths" clearable>
+                <el-option v-for="val in companyList" :key='val.id' :label="val.name" :value="val.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" style="height: 40px;">
             <el-form-item label="报价时间">
               <el-date-picker v-model="queryForm.quoteDate" style="width:100%" type="daterange" align="left"
@@ -248,8 +255,11 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
             交强险金额：
             <span>
@@ -257,27 +267,57 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-show="orderInfo.sypremium">
-            商业险金额：
-            <span>￥{{ orderInfo.sypremium }}</span>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+            </span>
           </div>
           <div v-show="orderInfo.taxamount">
             车船税：
             <span>￥{{ orderInfo.taxamount }}</span>
           </div>
-          <div v-if="orderInfo.accidentInfo">
-            驾意险：
-            <span>￥{{ orderInfo.jypremium }}</span>
-          </div>
           <div v-show="orderInfo.jqstartdate">
             交强险起保日期：
             <span>{{ orderInfo.jqstartdate }}</span>
           </div>
+        </div>
+        <div class="headers headers_Custom" >
+          <div v-show="orderInfo.sypremium">
+            商业险金额：
+            <span>￥{{ orderInfo.sypremium }}</span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+            </span>
+          </div>
           <div v-show="orderInfo.systartdate">
             商业险起保日期：
             <span>{{ orderInfo.systartdate }}</span>
           </div>
         </div>
+        <div class="headers headers_Custom" >
+          <div v-if="orderInfo.jypremium">
+            驾意险：
+            <span>￥{{ orderInfo.jypremium }}</span>
+          </div>
+        </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
         <div class="home flex j-s a-c back">
@@ -1010,6 +1050,7 @@
           "editId": "",
           "pageNum": 1,
           "pageSize": 20,
+          "insCompany":""
         },
 
         sendBackDialogVisible: false,//控制退回修改弹框
@@ -1056,10 +1097,13 @@
         systartdate: "",//商业时间
         mobile: "",//投保人手机号
         paycodeimg: "",//展示二维码
-
+        companyList:[], //保险公司
       }
     },
     created() {
+      this.$api.letter.gainTopList().then(res=>{
+        this.companyList=res.data
+      })
       this.peopleid = Cookies.get('user');
       if (this.peopleid != 'admin') {
         this.peopledeptid = Cookies.get('user').split('D')[0];
@@ -2635,7 +2679,7 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 20px 40px;
+      padding: 5px 30px;
       font-size: 16px;
 
       &>span {

src/views/Task/Underwrite.vue

@@ -69,6 +69,13 @@
 				<el-input clearable placeholder="受理人工号" v-model="queryForm.auditId"></el-input>
 			  </el-form-item>
 			</el-col>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="保险公司">
+              <el-select v-model="queryForm.insCompany" filterable  class="widths" clearable>
+                <el-option v-for="val in companyList" :key='val.id' :label="val.name" :value="val.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 			<el-col :span="12" style="height: 40px;">
 			  <el-form-item label="报价时间">
 				<el-date-picker v-model="queryForm.quoteDate" style="width:100%" type="daterange" align="left"
@@ -249,8 +256,11 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
             交强险金额：
             <span>
@@ -258,27 +268,57 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-show="orderInfo.sypremium">
-            商业险金额：
-            <span>￥{{ orderInfo.sypremium }}</span>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+            </span>
           </div>
           <div v-show="orderInfo.taxamount">
             车船税：
             <span>￥{{ orderInfo.taxamount }}</span>
           </div>
-          <div v-if="orderInfo.accidentInfo">
-            驾意险：
-            <span>￥{{ orderInfo.jypremium }}</span>
-          </div>
           <div v-show="orderInfo.jqstartdate">
             交强险起保日期：
             <span>{{ orderInfo.jqstartdate }}</span>
           </div>
+        </div>
+        <div class="headers headers_Custom" >
+          <div v-show="orderInfo.sypremium">
+            商业险金额：
+            <span>￥{{ orderInfo.sypremium }}</span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+            </span>
+          </div>
           <div v-show="orderInfo.systartdate">
             商业险起保日期：
             <span>{{ orderInfo.systartdate }}</span>
           </div>
         </div>
+        <div class="headers headers_Custom" >
+          <div v-if="orderInfo.jypremium">
+            驾意险：
+            <span>￥{{ orderInfo.jypremium }}</span>
+          </div>
+        </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
         <div class="home flex j-s a-c back">
@@ -1029,6 +1069,7 @@
 		  "editId": "",
 		  "pageNum": 1,
 		  "pageSize": 20,
+          "insCompany":""
 		},
   
 		sendBackDialogVisible: false,//控制退回修改弹框
@@ -1075,10 +1116,13 @@
 		systartdate: "",//商业时间
 		mobile: "",//投保人手机号
 		paycodeimg: "",//展示二维码
-  
+        companyList:[], //保险公司
 	  }
 	},
 	created() {
+      this.$api.letter.gainTopList().then(res=>{
+        this.companyList=res.data
+      })
 	  this.peopleid = Cookies.get('user');
 	  if (this.peopleid != 'admin') {
 		this.peopledeptid = Cookies.get('user').split('D')[0];
@@ -2654,7 +2698,7 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 20px 40px;
+      padding: 5px 30px;
       font-size: 16px;
       &>span {
         color: rgb(226, 118, 10);

src/views/Task/UnderwriteBack.vue

@@ -69,6 +69,13 @@
               <el-input clearable placeholder="受理人工号" v-model="queryForm.auditId"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" style="height: 40px;">
+            <el-form-item label="保险公司">
+              <el-select v-model="queryForm.insCompany" filterable  class="widths" clearable>
+                <el-option v-for="val in companyList" :key='val.id' :label="val.name" :value="val.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" style="height: 40px;">
             <el-form-item label="报价时间">
               <el-date-picker v-model="queryForm.quoteDate" style="width:100%" type="daterange" align="left"
@@ -249,8 +256,11 @@
         <div style="padding:20px;font-weight:bold;font-size:20px;">
           <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>
         </div>
-        <div class="headers headers_Custom" style="padding:20px;">
+        <div class="headers headers_Custom">
           <div v-show="orderInfo.jqpremium">
             交强险金额：
             <span>
@@ -258,27 +268,57 @@
                 orderInfo.jqpremium }}
             </span>
           </div>
-          <div v-show="orderInfo.sypremium">
-            商业险金额：
-            <span>￥{{ orderInfo.sypremium }}</span>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo&&orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.jqCoderFeeVo.costsPremiums }}
+            </span>
           </div>
           <div v-show="orderInfo.taxamount">
             车船税：
             <span>￥{{ orderInfo.taxamount }}</span>
           </div>
-          <div v-if="orderInfo.accidentInfo">
-            驾意险：
-            <span>￥{{ orderInfo.jypremium }}</span>
-          </div>
           <div v-show="orderInfo.jqstartdate">
             交强险起保日期：
             <span>{{ orderInfo.jqstartdate }}</span>
           </div>
+        </div>
+        <div class="headers headers_Custom" >
+          <div v-show="orderInfo.sypremium">
+            商业险金额：
+            <span>￥{{ orderInfo.sypremium }}</span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion">
+            手续费比例：
+            <span>
+              {{
+                orderInfo.queryOrderFeeVo.syCoderFeeVo.costsProportion  }}%
+            </span>
+          </div>
+          <div v-if="orderInfo.queryOrderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo&&orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums">
+            手续费金额：
+            <span>
+              ￥{{orderInfo.queryOrderFeeVo.syCoderFeeVo.costsPremiums }}
+            </span>
+          </div>
           <div v-show="orderInfo.systartdate">
             商业险起保日期：
             <span>{{ orderInfo.systartdate }}</span>
           </div>
         </div>
+        <div class="headers headers_Custom" >
+          <div v-if="orderInfo.jypremium">
+            驾意险：
+            <span>￥{{ orderInfo.jypremium }}</span>
+          </div>
+        </div>
       </div>
       <div class="Enclosure" v-if="orderInfo.extendInfo">
         <div class="home flex j-s a-c back">
@@ -1029,6 +1069,7 @@
           "editId": "",
           "pageNum": 1,
           "pageSize": 20,
+          "insCompany":""
         },
 
         sendBackDialogVisible: false,//控制退回修改弹框
@@ -1075,10 +1116,13 @@
         systartdate: "",//商业时间
         mobile: "",//投保人手机号
         paycodeimg: "",//展示二维码
-
+        companyList:[], //保险公司
       }
     },
     created() {
+      this.$api.letter.gainTopList().then(res=>{
+        this.companyList=res.data
+      })
       this.peopleid = Cookies.get('user');
       if (this.peopleid != 'admin') {
         this.peopledeptid = Cookies.get('user').split('D')[0];
@@ -2654,7 +2698,7 @@
   /* 内容待定 */
   .headers_Custom {
     div {
-      padding: 20px 40px;
+      padding: 5px 30px;
       font-size: 16px;
       &>span {
         color: rgb(226, 118, 10);