Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

src/pages/recruit/PromoterList.vue

@@ -56,7 +56,7 @@
           <Button type="text"
                   class="router-btn"
                   style="color:2DBCF0!important"
-                  @click="() => {doShow(row,true)}">查看上下级</Button>
+                  @click="() => {doShow(true,row)}">查看上下级</Button>
         </i-col>
       </template>
     </Table>
@@ -269,7 +269,7 @@ export default {
                 },
                 on: {
                   click: () => {
-                    that.doShow(params.row, true)
+                    that.doShow(true,params.row)
                   }
                 }
               }, '查看上下级'),
@@ -464,25 +464,11 @@ export default {
       }
       this.upgradeStr = `确认将${index.name}从${str}升级成${next}吗?`;
     },
-    doShow (currData, ishow) {
+    doShow (ishow,currData) {
-      this.showrecruit = false;
+      this.showrecruit = ishow;
-      let that = this;
+      if(ishow){
-      let param = {
+        this.recruitSchedule = currData;
-        promoterId: currData.id
       }
-      bulletinService.promoterDetail(param, function (data) {
-        that.loading = false;
-        if (data.data.code == "0000") {
-          // TODO 接口暂无数据,先传当前点击行数据,待后续完善.
-          that.showrecruit = ishow;
-          that.recruitSchedule = currData;
-          console.log(data.data);
-        } else {
-          that.$Message.error("系统异常");
-        }
-      }, function (error) {
-        that.loading = false;
-      });
     },
   }
 }

src/pages/recruit/recruitTable.vue

@@ -17,16 +17,19 @@
           <div class="t-rows">
             <div>{{schedule.fissionUser.name}}</div>
             <div>{{schedule.fissionUser.mobil}}</div>
-            <div>{{level}}</div>
+            <div>{{schedule.level | level}}</div>
           </div>
         </div>
-        <div class="m-subordinate">下级(0人)</div>
+        <div class="m-subordinate">下级({{formData.total}}人)</div>
         <div>
-          <!-- <div class="t-rows">
+          <div class="t-rows" v-for="(item,index) in formData.records" :key="index"> 
-          <div>张胜男</div>
+            <div>{{item.promoterInfo.name}}</div>
-          <div>13123209313</div>
+            <div>{{item.promoterInfo.phone}}</div>
-          <div>推广员</div>
+            <div>{{item.promoterInfo.level | level}}</div>
-        </div> -->
+          </div>
+          <template>
+            <Page v-if="formData.total>10" :total="formData.total" @on-change="onChange" size="small"></Page>
+        </template>
         </div>
       </div>
       <div slot="footer">
@@ -36,7 +39,7 @@
   </div>
 </template>
 <script>
-
+  import bulletinService from '../../services/recruit/Bulletin'
   export default {
     name: "recruitTable",
     components: {
@@ -44,11 +47,15 @@ export default {
     },
     data () {
       return {
+        formData:{
+          dataList:[]
+        },
         isShow: false,
         currentStep: 0,
         modal_loading: false,
         loading: false,
-      showUse: false
+        showUse: false,
+        pageNum: 1,
       };
     },
     props: {
@@ -67,6 +74,7 @@ export default {
     watch: {
       show () {
         this.showUse = this.show;        
+        this.getList();
       },
       schedule () {
         console.log('schedule监听', this.schedule);
@@ -74,9 +82,31 @@ export default {
       }
     },
     computed: {
-    level () {
+      // level () {
+      //   let str = "";
+      //   switch (this.schedule.level) {
+      //     case 1:
+      //       str = "一般推广员";
+      //       break;
+      //     case 2:
+      //       str = "客户经理";
+      //       break;
+      //     case 3:
+      //       str = "服务经理";
+      //       break;
+      //     default:
+      //       str = "一般推广员";
+      //   }
+      //   return str;
+      // }
+    },
+    mounted () {
+      
+    },
+    filters: {
+      level: function(value) {
         let str = "";
-      switch (this.schedule.level) {
+        switch (value) {
           case 1:
             str = "一般推广员";
             break;
@@ -90,14 +120,33 @@ export default {
             str = "一般推广员";
         }
         return str;
-    }
       },
-  mounted () { },
+    },
     methods: {
       cancel () {
         this.modal_loading = false;
+        this.$emit("doShow", false);
       },
-
+      onChange(e){
+        this.pageNum = e;
+        this.getList();
+      },
+      getList(){
+        let that = this;
+        let param = {
+          pageNum: this.pageNum,
+          userId:this.schedule.userId
+        }
+        bulletinService.promoterDetail(param, function (data) {
+          if (data.data.code == "0000") {
+            that.formData = data.data.results
+          } else {
+            that.$Message.error("系统异常");
+          }
+        }, function (error) {
+          that.loading = false;
+        });
+      }
     },
   };
 </script>