diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js
index b45bbaef9..671af170d 100644
--- a/src/router/ebiz/index.js
+++ b/src/router/ebiz/index.js
@@ -20,8 +20,11 @@ import renewalManage from './renewalManage'
 import preserve from './preserve'
 import exercising from './exercising'
 import productStore from './product-store'
+<<<<<<< HEAD
 import performance from './performance'
 import attendance from './attendance'
+=======
+>>>>>>> feature/【机构业绩查询】-new
 // 机构业绩
 import institutionalPerform from './institutionalPerform'
 export default [
@@ -41,6 +44,7 @@ export default [
   ...nbs,
   ...survey,
   ...manpower,
+<<<<<<< HEAD
   ...renewalManage,
   ...preserve,
   ...exercising,
@@ -52,3 +56,9 @@ export default [
   ...institutionalPerform,
   ...question
 ] //根据需要进行删减
+=======
+  ...institutionalPerform,
+  ...claims,
+  ...productStore
+] //根据需要进行删减
+>>>>>>> feature/【机构业绩查询】-new
diff --git a/src/views/ebiz/institutionalPerform/BranchOffice.vue b/src/views/ebiz/institutionalPerform/BranchOffice.vue
index bd291d855..c7919467f 100644
--- a/src/views/ebiz/institutionalPerform/BranchOffice.vue
+++ b/src/views/ebiz/institutionalPerform/BranchOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9">
+=======
+        <van-col class="fs14 mp2" span="9">
+>>>>>>> feature/【机构业绩查询】-new
           <span v-if="showText">截至</span>
           {{timeVal}}
         </van-col>
@@ -80,11 +84,19 @@
     <!-- <div class="slide-box"> -->
        <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table class="fs14" style="table-layout：fixed;padding-left: 4.3em;">
         <!-- <thead> -->
         <tr v-if="curMainType=='01'" class="title">
           <th class="td-1" style="height: 17px;">排名</th>
           <th>机构</th>
+=======
+      <table class="fs14" style="table-layout：fixed;padding-left: 14.5em;">
+        <!-- <thead> -->
+        <tr v-if="curMainType=='01'" class="title">
+           <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
           <th>预收标保</th>
           <th>承保标保</th>
           <th>承保保费</th>
@@ -94,7 +106,11 @@
         </tr>
         <tr v-if="curMainType=='02'" class="title">
           <th class="td-1">排名</th>
+<<<<<<< HEAD
           <th>机构</th>
+=======
+          <th class="td-2">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
           <th>活动人力</th>
           <th>合格人力</th>
           <th>桂冠人力</th>
@@ -105,6 +121,7 @@
         <tbody>-->
         <tr>
           <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -122,6 +139,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+          <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-show="curMainType=='01'" v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+          <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+          <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <!-- 分公司 -->
             <span @click="toZhi(item.code)" class="red">查看</span>
@@ -170,6 +206,11 @@ export default {
       currentDate: new Date(),
       sortType: '1',
       // 业绩总和
+<<<<<<< HEAD
+=======
+      ysbbTotal:0,
+      bzbfTotol:0,
+>>>>>>> feature/【机构业绩查询】-new
       ysjsTotal: 0,
       ysbbTotol: 0,
       cbjsTotal: 0,
@@ -185,7 +226,11 @@ export default {
       // 数据
       personalDate: [],
       timeVal: '',
+<<<<<<< HEAD
       sortTypeText: '预收件数',
+=======
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       // 人力排名
       // sortTypeText: '活动人力',
@@ -396,8 +441,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             // 业绩排名的 总计计算
             $this.tableData.map(function (val) {
+=======
+             $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -515,7 +569,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -534,5 +591,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+          .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/DepartmentOffice.vue b/src/views/ebiz/institutionalPerform/DepartmentOffice.vue
index fb60a658d..a2deb22b0 100644
--- a/src/views/ebiz/institutionalPerform/DepartmentOffice.vue
+++ b/src/views/ebiz/institutionalPerform/DepartmentOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9">
+=======
+        <van-col class="fs14 mp2" span="9">
+>>>>>>> feature/【机构业绩查询】-new
           <span v-if="showText">截至</span>
           {{timeVal}}
         </van-col>
@@ -79,10 +83,17 @@
     </div>
    <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table class="fs14" style="table-layout：fixed;padding-left: 4.3em;">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
           <th>机构</th>
+=======
+      <table class="fs14" style="table-layout：fixed;padding-left: 14.5em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
           <th>预收标保</th>
           <th>承保标保</th>
           <th>承保保费</th>
@@ -92,6 +103,7 @@
         </tr>
         <tr>
            <th class="white td-1" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -109,6 +121,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+          <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+          <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -145,6 +176,11 @@ export default {
       currentDate: new Date(),
       sortType: '1',
       // 总和
+<<<<<<< HEAD
+=======
+      bzbfTotol:0,
+       ysbbTotal:0,
+>>>>>>> feature/【机构业绩查询】-new
       ysjsTotal: 0,
       ysbbTotol: 0,
       cbjsTotal: 0,
@@ -152,7 +188,11 @@ export default {
       bzbfTotal: 0,
       tableData: [],
       timeVal: '',
+<<<<<<< HEAD
       sortTypeText: '预收件数',
+=======
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -347,8 +387,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysjs)
+=======
+            $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -429,7 +478,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -458,7 +510,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -477,5 +532,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+          .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/DistrictOffice.vue b/src/views/ebiz/institutionalPerform/DistrictOffice.vue
index b01fc055d..3e519daee 100644
--- a/src/views/ebiz/institutionalPerform/DistrictOffice.vue
+++ b/src/views/ebiz/institutionalPerform/DistrictOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+=======
+        <van-col class="fs14 mp2" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+>>>>>>> feature/【机构业绩查询】-new
         <van-col span="3">
           <img :src="point" />
         </van-col>
@@ -76,10 +80,17 @@
     </div>
       <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table class="fs14" style="table-layout：fixed;padding-left: 4.3em;">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
           <th>机构</th>
+=======
+      <table class="fs14" style="table-layout：fixed;padding-left: 9.3em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
             <th>预收标保</th>
             <th>承保标保</th>
             <th>承保保费</th>
@@ -89,6 +100,7 @@
         </tr>
         <tr>
             <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -106,6 +118,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+         <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+           <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -147,9 +178,17 @@ export default {
       cbjsTotal: 0,
       cbbfTotal: 0,
       bzbfTotal: 0,
+<<<<<<< HEAD
       tableData: [],
       timeVal: '',
       sortTypeText: '预收件数',
+=======
+       ysbbTotal:0,
+        bzbfTotol:0,
+      tableData: [],
+      timeVal: '',
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -346,8 +385,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysjs)
+=======
+            $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -430,7 +478,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -459,7 +510,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -478,5 +532,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+         .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/GroupOffice.vue b/src/views/ebiz/institutionalPerform/GroupOffice.vue
index 8a5f4c7ab..538d54af3 100644
--- a/src/views/ebiz/institutionalPerform/GroupOffice.vue
+++ b/src/views/ebiz/institutionalPerform/GroupOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+=======
+        <van-col class="fs14 mp2" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+>>>>>>> feature/【机构业绩查询】-new
         <van-col span="3">
           <img :src="point" />
         </van-col>
@@ -76,10 +80,17 @@
     </div>
     <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table style="table-layout：fixed;padding-left: 4.3em;" class="fs14">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
            <th>机构</th>
+=======
+      <table class="fs14" style="table-layout：fixed;padding-left: 9.3em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
             <th>预收标保</th>
             <th>承保标保</th>
             <th>承保保费</th>
@@ -89,6 +100,7 @@
         </tr>
         <tr>
            <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -106,6 +118,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+         <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+          <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -142,6 +173,11 @@ export default {
       currentDate: new Date(),
       sortType: '1',
       // 总和
+<<<<<<< HEAD
+=======
+       ysbbTotal:0,
+        bzbfTotol:0,
+>>>>>>> feature/【机构业绩查询】-new
       ysjsTotal: 0,
       ysbbTotol: 0,
       cbjsTotal: 0,
@@ -149,7 +185,11 @@ export default {
       bzbfTotal: 0,
       tableData: [],
       timeVal: '',
+<<<<<<< HEAD
       sortTypeText: '预收件数',
+=======
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -347,8 +387,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysjs)
+=======
+            $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -429,7 +478,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -458,7 +510,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -477,5 +532,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+         .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/PersonalOffice.vue b/src/views/ebiz/institutionalPerform/PersonalOffice.vue
index 0a4fce3ea..bbe31d7fc 100644
--- a/src/views/ebiz/institutionalPerform/PersonalOffice.vue
+++ b/src/views/ebiz/institutionalPerform/PersonalOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+=======
+        <van-col class="fs14 mp2" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+>>>>>>> feature/【机构业绩查询】-new
         <van-col span="3">
           <img :src="point" />
         </van-col>
@@ -76,10 +80,17 @@
     </div>
     <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table style="table-layout：fixed;padding-left: 4.3em;" class="fs14">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
            <th>机构</th>
+=======
+   <table class="fs14" style="table-layout：fixed;padding-left: 9.3em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
             <th>预收标保</th>
             <th>承保标保</th>
             <th>承保保费</th>
@@ -88,6 +99,7 @@
         </tr>
         <tr>
             <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -105,6 +117,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+        <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+           <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
         </tr>
       </table>
     </div>
@@ -143,8 +174,15 @@ export default {
       cbbfTotal: 0,
       bzbfTotal: 0,
       tableData: [],
+<<<<<<< HEAD
       timeVal: '',
       sortTypeText: '预收件数',
+=======
+       ysbbTotal:0,
+        bzbfTotol:0,
+      timeVal: '',
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -332,8 +370,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysjs)
+=======
+           $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -414,7 +461,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -443,7 +493,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -462,5 +515,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+         .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/RegionalOffice.vue b/src/views/ebiz/institutionalPerform/RegionalOffice.vue
index 7d0b45953..3f8d4fbf9 100644
--- a/src/views/ebiz/institutionalPerform/RegionalOffice.vue
+++ b/src/views/ebiz/institutionalPerform/RegionalOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+=======
+        <van-col class="fs14 mp2" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+>>>>>>> feature/【机构业绩查询】-new
         <van-col span="3">
           <img :src="point" />
         </van-col>
@@ -76,10 +80,17 @@
     </div>
     <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table style="table-layout：fixed;padding-left: 4.3em;" class="fs14">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
            <th>机构</th>
+=======
+     <table class="fs14" style="table-layout：fixed;padding-left: 9.3em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
             <th>预收标保</th>
             <th>承保标保</th>
             <th>承保保费</th>
@@ -89,6 +100,7 @@
         </tr>
         <tr>
             <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -106,6 +118,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+         <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+          <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -148,8 +179,15 @@ export default {
       cbbfTotal: 0,
       bzbfTotal: 0,
       tableData: [],
+<<<<<<< HEAD
       timeVal: '',
       sortTypeText: '预收件数',
+=======
+       ysbbTotal:0,
+        bzbfTotol:0,
+      timeVal: '',
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -347,8 +385,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysjs)
+=======
+           $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -429,7 +476,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -458,7 +508,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -477,5 +530,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+         .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/ServiceDepartOffice.vue b/src/views/ebiz/institutionalPerform/ServiceDepartOffice.vue
index f0bcc958b..1a342f390 100644
--- a/src/views/ebiz/institutionalPerform/ServiceDepartOffice.vue
+++ b/src/views/ebiz/institutionalPerform/ServiceDepartOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+=======
+        <van-col class="fs14 mp2" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+>>>>>>> feature/【机构业绩查询】-new
         <van-col span="3">
           <img :src="point" />
         </van-col>
@@ -76,10 +80,17 @@
     </div>
    <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table style="table-layout：fixed;padding-left: 4.3em;" class="fs14">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
          <th>机构</th>
+=======
+     <table class="fs14" style="table-layout：fixed;padding-left: 9.3em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
             <th>预收标保</th>
             <th>承保标保</th>
             <th>承保保费</th>
@@ -89,6 +100,7 @@
         </tr>
         <tr>
             <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -106,6 +118,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+         <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+          <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -145,11 +176,20 @@ export default {
       ysjsTotal: 0,
       ysbbTotol: 0,
       cbjsTotal: 0,
+<<<<<<< HEAD
+=======
+       ysbbTotal:0,
+        bzbfTotol:0,
+>>>>>>> feature/【机构业绩查询】-new
       cbbfTotal: 0,
       bzbfTotal: 0,
       tableData: [],
       timeVal: '',
+<<<<<<< HEAD
       sortTypeText: '预收件数',
+=======
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -345,8 +385,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysjs)
+=======
+           $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -427,7 +476,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -456,7 +508,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -475,5 +530,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+         .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>
diff --git a/src/views/ebiz/institutionalPerform/UnderOffice.vue b/src/views/ebiz/institutionalPerform/UnderOffice.vue
index ef15376bc..df78406cb 100644
--- a/src/views/ebiz/institutionalPerform/UnderOffice.vue
+++ b/src/views/ebiz/institutionalPerform/UnderOffice.vue
@@ -22,7 +22,11 @@
         <van-col span="3">
           <img :src="calendar" />
         </van-col>
+<<<<<<< HEAD
         <van-col class="fs14" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+=======
+        <van-col class="fs14 mp2" span="9"><span v-if="showText">截至</span>{{timeVal}}</van-col>
+>>>>>>> feature/【机构业绩查询】-new
         <van-col span="3">
           <img :src="point" />
         </van-col>
@@ -76,10 +80,17 @@
     </div>
     <div class="layer-box">
         <div class="layer">
+<<<<<<< HEAD
       <table class="fs14" style="table-layout：fixed;padding-left: 4.3em;">
         <tr class="title">
           <th class="td-1" style="height: 17px;">排名</th>
           <th>机构</th>
+=======
+     <table class="fs14" style="table-layout：fixed;padding-left: 14.5em;">
+        <tr class="title">
+          <th class="td-1" style="height: 1.2em;">排名</th>
+          <th class="td-2" style="height: 1.2em;width:8.6em">机构</th>
+>>>>>>> feature/【机构业绩查询】-new
             <th>预收标保</th>
             <th>承保标保</th>
             <th>承保保费</th>
@@ -89,6 +100,7 @@
         </tr>
         <tr>
             <th class="td-1 white" style="width:4.3em">1</th>
+<<<<<<< HEAD
           <th>合计</th>
           <th>{{ysjsTotal.toFixed(2)}}</th>
           <th>{{ysbbTotol.toFixed(2)}}</th>
@@ -106,6 +118,25 @@
           <td>{{item.cbjs}}</td>
           <td>{{item.cbbf}}</td>
           <td>{{item.bzbf}}</td>
+=======
+          <th class="td-2">合计</th>
+         <th>{{ysbbTotal.toFixed(2)}}</th>
+          <th>{{bzbfTotol.toFixed(2)}}</th>
+          <th>{{cbbfTotal.toFixed(2)}}</th>
+          <th>{{ysjsTotal}}</th>
+          <th>{{cbjsTotal}}</th>
+        </tr>
+        <tr v-for="(item,index) in tableData" :key="index">
+          <td class="td-1">{{index+1}}</td>
+          <td class="td-2">
+            <div style="width:10em">{{item.name}}</div>
+          </td>
+         <td>{{item.ysbb}}</td>
+          <td>{{item.bzbf}}</td>
+          <td>{{item.cbbf}}</td>
+          <td>{{item.ysjs}}</td>
+          <td>{{item.cbjs}}</td>
+>>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -145,10 +176,19 @@ export default {
       ysbbTotol: 0,
       cbjsTotal: 0,
       cbbfTotal: 0,
+<<<<<<< HEAD
       bzbfTotal: 0,
       tableData: [],
       timeVal: '',
       sortTypeText: '预收件数',
+=======
+       ysbbTotal:0,
+      bzbfTotal: 0,
+      tableData: [],
+       bzbfTotol:0,
+      timeVal: '',
+      sortTypeText: '预收标保',
+>>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -320,7 +360,11 @@ export default {
     getlComPremDetil() {
       let $this = this
       let data = {
+<<<<<<< HEAD
         manageCode: this.$route.query.manageCode,
+=======
+        manageCode: "8645",
+>>>>>>> feature/【机构业绩查询】-new
         manageLv: "02",
         sortType: this.sortType,
         queryType: this.dateType,
@@ -345,8 +389,17 @@ export default {
             $this.cbjsTotal = 0
             $this.cbbfTotal = 0
             $this.bzbfTotal = 0
+<<<<<<< HEAD
             $this.tableData.map(function (val) {
               console.log(val.ysbb)
+=======
+           $this.ysbbTotal =0
+              $this.bzbfTotol=0
+            // 业绩排名的 总计计算
+            $this.tableData.map(function (val) {
+                  $this.bzbfTotol = Number($this.bzbfTotol) + Number(val.ysbb)
+               $this.ysbbTotal = Number($this.ysbbTotal) + Number(val.ysbb)
+>>>>>>> feature/【机构业绩查询】-new
               $this.ysjsTotal = Number($this.ysjsTotal) + Number(val.ysjs)
               $this.ysbbTotol = Number($this.ysbbTotol) + Number(val.ysbb)
               $this.cbjsTotal = Number($this.cbjsTotal) + Number(val.cbjs)
@@ -378,9 +431,17 @@ export default {
     }, 1000)
   },
   mounted() {
+<<<<<<< HEAD
     setInterval(this.getCurrentDate(), 1000 * 60)
  this.timeVal=this.$route.query.timeVal||""
  this.showText=this.$route.query.showText
+=======
+//  this.timeVal=this.$route.query.timeVal||""
+//  this.showText=this.$route.query.showText
+
+    this.getCurrentDate()
+    setInterval(this.getCurrentDate, 1000 * 60)
+>>>>>>> feature/【机构业绩查询】-new
     this.getlComPremDetil()
   },
 }
@@ -431,7 +492,10 @@ export default {
   }
   table td {
     text-align: center;
+<<<<<<< HEAD
     white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -460,7 +524,10 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
+<<<<<<< HEAD
             white-space: nowrap;
+=======
+>>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -479,5 +546,16 @@ export default {
             z-index: 2;
             width: 3em;
         }
+<<<<<<< HEAD
+=======
+         .td-2{
+           position: absolute;
+            left: 4.6em;
+            z-index: 2;
+            width: 10em;
+            padding: 0;
+            height: 2.3em;
+        }
+>>>>>>> feature/【机构业绩查询】-new
 }
 </style>