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

src/pages/recruit/CheckList.vue

@@ -689,7 +689,8 @@ export default {
         function(data) {
           that.loading = false;
           if (data.data.code == "0000") {
-            that.$Message.info("审核通过");
+            that.$Message.info(data.data.results);
+            _this.$router.push("/recruit/check/list");
           } else {
             that.$Message.error("系统异常");
           }

src/pages/recruit/PromoterList.vue

@@ -123,27 +123,29 @@
                     },
                     {
                         title: '等级',
-                        key: 'level',
+                        width:80,
-                        width:80
+                        render: (h, params) => {
+                            return h('span', params.row.organizational.level);
+                        }
                     },
                     {
                         title: '客户经理数',
-                        key: 'managerNumb',
+                        key: 'customerManagerCount',
                         width:120
                     },
                     {
                         title: '推广员数',
-                        key: 'extensionNumb',
+                        key: 'extensionCount',
                         width:120
                     },
                     {
                         title: '客户数',
-                        key: 'clientNumb',
+                        key: 'customerCount',
                         width:80
                     },
                     {
                         title: '业绩',
-                        key: 'performance',
+                        key: 'achievement',
                         width:80
                     },
                     {
@@ -339,9 +341,9 @@
                 };
                 bulletinService.promoterList(request, function (data) {
                     that.loading = false;
-                    if (data.code == "0000") {
+                    if (data.data.code == "0000") {
                         that.data1 = [];
-                        let datas = data.results;
+                        let datas = data.data.results;
                         //总页数
                         if (datas.total == null) {
                             that.total = 0;
@@ -367,9 +369,23 @@
             cancel(){
               this.isShow = false;
             },
-            // 拒绝审核
+            // 升级
-            confirm(index) {
+            confirm(rData) {
-                console.log(123);                
+                let request={
+                    promoterId:rData.id
+                }
+                let that = this;
+                bulletinService.promoterUpgrade(request, function (data) {
+                    that.loading = false;
+                    if (data.data.code == "0000") {
+                        that.$Message.info("升级成功");
+                        that.getPromoterList();
+                    }else{
+                        that.$Message.error("系统异常");
+                    }
+                }, function (error) {
+                    that.loading = false;
+                });
                 this.isShow = false;
             },
             show(index) {
@@ -377,16 +393,28 @@
                 this.rowData = index;
             },
             doShow (currData,ishow) {
-              this.showrecruit = ishow;
+                debugger
-              this.recruitSchedule = currData;
+                this.showrecruit = false;
+                let that = this;
+                let param = {
+                    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;
+                });
             },
         }
     }
-    
-// 列表: /fission/promoter/list
-// 查看上下级: /fission/promoter/detail
-// 升级: /fission/promoter/upgrade
-// 列表的数据结构和招募审核列表的数据结构一致
 </script>
 
 <style scoped>

src/pages/recruit/recruitTable.vue

@@ -8,8 +8,8 @@
       width="70%">
       <div class="m-info">
         <div class="m-info-top">
-          <p>所属零售公司：上海零售公司</p>
+          <p>所属零售公司：{{schedule.organizational.name}}</p>
-          <p>所属店铺：上海奇硕店铺</p>
+          <p>所属店铺：{{schedule.store.name}}</p>
         </div>
         <div class="m-superior">上级</div>
         <Table ref="table" style="width:100%!important" :show-header="false" :loading="loading" :columns="columns1" :data="data1" class="table-store">
@@ -48,7 +48,7 @@ export default {
                     {
                         title: '上级手机号',
                         key: 'superiorPhone',
-                        width:120
+                        width:140
                     },
                     {
                         title: '职务',
@@ -73,7 +73,7 @@ export default {
                     {
                         title: '下级手机号',
                         key: 'subordinatePhone',
-                        width:120
+                        width:130
                     },
                     {
                         title: '职务',
@@ -118,6 +118,9 @@ export default {
     show () {
       this.showUse = this.show;
     },
+    schedule(){
+      console.log('schedule监听',this.schedule)
+    }
   },
   mounted () { },
   methods: {

src/services/recruit/Bulletin.js

@@ -22,7 +22,7 @@ export function promoterList(params, call) {
 }
 //推广员管理 查看看上下级
 export function promoterDetail(params, call) {
-  return http.post('/fission/promoter/detail', params).then(call)
+  return http.get('/fission/promoter/detail', params).then(call)
 }
 //推广员管理 升级
 export function promoterUpgrade(params, call) {