机构业绩

src/router/ebiz/index.js

@@ -20,11 +20,6 @@ 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 [
@@ -44,21 +39,7 @@ export default [
   ...nbs,
   ...survey,
   ...manpower,
-<<<<<<< HEAD
-  ...renewalManage,
-  ...preserve,
-  ...exercising,
-  ...productStore,
-  ...claims,
-  ...productStore,
-  ...performance,
-  ...attendance,
-  ...institutionalPerform,
-  ...question
-] //根据需要进行删减
-=======
   ...institutionalPerform,
   ...claims,
   ...productStore
 ] //根据需要进行删减
->>>>>>> feature/【机构业绩查询】-new

src/views/ebiz/institutionalPerform/GroupOffice.vue

@@ -22,11 +22,7 @@
         <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>
@@ -80,17 +76,10 @@
     </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>
@@ -100,25 +89,6 @@
         </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>
-          <th>{{cbjsTotal.toFixed(2)}}</th>
-          <th>{{cbbfTotal.toFixed(2)}}</th>
-          <th>{{bzbfTotal.toFixed(2)}}</th>
-        </tr>
-        <tr v-for="(item,index) in tableData" :key="index">
-          <td class="td-1">{{index+1}}</td>
-          <td>
-            <div style="width:10em">{{item.name}}</div>
-          </td>
-          <td>{{item.ysjs}}</td>
-          <td>{{item.ysbb}}</td>
-          <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>
@@ -136,7 +106,6 @@
           <td>{{item.cbbf}}</td>
           <td>{{item.ysjs}}</td>
           <td>{{item.cbjs}}</td>
->>>>>>> feature/【机构业绩查询】-new
           <td>
             <span @click="toDetail(item.code)" class="red">查看</span>
           </td>
@@ -173,11 +142,8 @@ export default {
       currentDate: new Date(),
       sortType: '1',
       // 总和
-<<<<<<< HEAD
-=======
        ysbbTotal:0,
         bzbfTotol:0,
->>>>>>> feature/【机构业绩查询】-new
       ysjsTotal: 0,
       ysbbTotol: 0,
       cbjsTotal: 0,
@@ -185,11 +151,7 @@ export default {
       bzbfTotal: 0,
       tableData: [],
       timeVal: '',
-<<<<<<< HEAD
-      sortTypeText: '预收件数',
-=======
       sortTypeText: '预收标保',
->>>>>>> feature/【机构业绩查询】-new
       queryColumns: ['预收件数', '预收标保', '承保件数', '承保标保', '承保标保'],
       showPicker: false,
       // 年月日选择器
@@ -387,17 +349,12 @@ 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)
@@ -478,10 +435,6 @@ export default {
   }
   table td {
     text-align: center;
-<<<<<<< HEAD
-    white-space: nowrap;
-=======
->>>>>>> feature/【机构业绩查询】-new
     border-width: 1px;
     padding: 8px;
     // border-style: solid;
@@ -510,10 +463,6 @@ export default {
             border-right: 1px solid #333;
             line-height: 30px; */
             /* box-sizing: border-box; */
-<<<<<<< HEAD
-            white-space: nowrap;
-=======
->>>>>>> feature/【机构业绩查询】-new
             background: #fff;
         }
         .layer-box{
@@ -532,8 +481,6 @@ export default {
             z-index: 2;
             width: 3em;
         }
-<<<<<<< HEAD
-=======
          .td-2{
            position: absolute;
             left: 4.6em;
@@ -542,6 +489,5 @@ export default {
             padding: 0;
             height: 2.3em;
         }
->>>>>>> feature/【机构业绩查询】-new
 }
 </style>