Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/LeaderManagement/leaderPerformance.vue

@@ -87,7 +87,7 @@
     height: 230px;
     border: 1px solid #E6E6E6;
     border-radius: 4px;
-    margin-right: 10px;
+    margin:0 10px 10px 0;
     background-color: #fff;
     padding: 0 20px;
   }
@@ -282,6 +282,22 @@
   .guidPerformance ._btTitle:last-child {
     border-bottom: 0;
   }
+  .leaderTousuTable{
+    border:1px solid #E6E6E6;
+    float:left;
+    width:226px;
+    margin-top:20px;
+    border-collapse:collapse;
+  }
+  .leaderTousuTable th{
+    background-color: #f1f1f1;
+    color:#666666;
+    font-size:14px;
+    border:1px solid #E6E6E6;
+  }
+.leaderTousuTable tr{background: #fff;text-align: center; height: 40px;}
+.leaderTousuTable tr:nth-child(2n+1){background:#fafafa; }
+.leaderTousuTable tr td{font-size: 12px;border: 1px solid #E5E5E5;}
 
 </style>
 <template>
@@ -508,23 +524,45 @@
               </div>
             </div>
           </div>
-        </template>
-      </div>
-      <template v-if="msg.Type<7">
-        <div class="rightDiv">
-          <div class="_btTitle" v-for="(item,index) in twelveToTwenty" :key="item.subCode">
-            <div class="tweleindex">{{12+index}}</div>
-            <div class="peopleInfo clearfix">
-              <div class="HeadPortrait TW">
-                <img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
-                <img v-else :src="item.EmPhoto" :onerror='defaultImg' />
-              </div>
-              <span class="peopleName">{{item.Name}}</span>
-              <div class="TweleEx">￥{{item.LeaderExtract}}</div>
+          <div class="leftBottom clearfix">
+            <div class="bottomList">
+                <div class="btLittle" v-for="(item,index) in twelveToFifteen" :key="item.subCode">
+                  <div class="_index">{{12+index}}</div>
+                  <div class="peopleInfo clearfix">
+                    <div class="HeadPortrait">
+                      <img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
+                      <img v-else :src="item.EmPhoto" :onerror='defaultImg' />
+                    </div>
+                    <span class="peopleName">{{item.Name}}</span>
+                    <div class="peopleMoney">￥{{item.LeaderExtract}}</div>
+                  </div>
+                </div>
+            </div>
+            <div class="bottomList">
+                <div class="btLittle" v-for="(item,index) in fifteenTonitten" :key="item.subCode">
+                  <div class="_index">{{16+index}}</div>
+                  <div class="peopleInfo clearfix">
+                    <div class="HeadPortrait">
+                      <img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
+                      <img v-else :src="item.EmPhoto" :onerror='defaultImg' />
+                    </div>
+                    <span class="peopleName">{{item.Name}}</span>
+                    <div class="peopleMoney">￥{{item.LeaderExtract}}</div>
+                  </div>
+                </div>
             </div>
           </div>
-        </div>
-      </template>
+        </template>
+      </div>
+      <table class="leaderTousuTable" style="display:none;">
+        <tr>
+          <th>投诉次数</th>
+          <th>意见调查表缺少张数</th>
+        </tr>
+        <tr>
+          <td colspan="2">功能正在开发中</td>
+        </tr>
+      </table>
     </div>
   </div>
 </template>
@@ -559,6 +597,10 @@
         eightToeleven: '',
         //12-20名
         twelveToTwenty: '',
+        //12-15
+        twelveToFifteen: '',
+        //15-19
+        fifteenTonitten: '',
         //购物店名称
         ShopList: [],
         monthList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
@@ -589,6 +631,7 @@
         this.fourToSeven = [];
         this.eightToeleven = [];
         this.twelveToTwenty = [];
+        this.twelveToFifteen = [];
         this.DataList = [];
         this.apipost("LeaderSchedule_get_GetLeaderList", msg, res => {
             this.loading = false;
@@ -601,7 +644,9 @@
                 this.jijun = nArray.splice(0, 1);
                 this.fourToSeven = nArray.splice(0, 4);
                 this.eightToeleven = nArray.splice(0, 4);
-                this.twelveToTwenty = nArray.splice(0, 9);
+                //this.twelveToTwenty = nArray.splice(0, 9);
+                this.twelveToFifteen = nArray.splice(0, 4);
+                this.fifteenTonitten = nArray.splice(0, 4);
               }
             }
           },