From 8de62f1772008088a0c10a16b3ae4454bbca10ce Mon Sep 17 00:00:00 2001
From: liuyang <396235408@qq.com>
Date: Sun, 14 Jun 2020 19:29:47 +0800
Subject: [PATCH] 1

---
 src/pages/recruit/CheckList.vue    | 154 ++++++++++++++++++-----------
 src/pages/recruit/PromoterList.vue | 105 +++++++++++---------
 src/services/recruit/Bulletin.js   |  32 +++++-
 vue.config.js                      |   2 +-
 4 files changed, 187 insertions(+), 106 deletions(-)

diff --git a/src/pages/recruit/CheckList.vue b/src/pages/recruit/CheckList.vue
index 02204dd..609b5ff 100644
--- a/src/pages/recruit/CheckList.vue
+++ b/src/pages/recruit/CheckList.vue
@@ -106,7 +106,7 @@
                 <p>审核不通过原因</p>
             </div>
             <div>
-                <i-input type="textarea" :rows="4" placeholder="请填写审核不通过原因"></i-input>
+                <i-input v-model="remark" type="textarea" :rows="4" placeholder="请填写审核不通过原因"></i-input>
             </div>
             <div style="margin-top:20px;text-align: center;">
                 <Button ghost type="primary" @click="refuse(rowData)">确定</Button>
@@ -141,6 +141,9 @@
 <script>
   import zeroExtend from "../../services/customer/zeroExtend";
   import staff from "../../services/staff/staff";
+  import { formatDate } from "../../utils/Common";
+  import bulletinService from '../../services/recruit/Bulletin'
+
     export default {
         name: "",
         data() {
@@ -149,7 +152,7 @@
                 userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
                 searchShop:null,
                 date:"",
-                companyId:0,                
+                companyId:null,                
                 refuseIsShow: false,
                 passIsShow:false,
                 showStoreName: '',
@@ -158,7 +161,7 @@
                 companyList: [],                
                 //所有组织list
                 organizationalList: [],
-                selectedStore: 0,
+                selectedStore: null,
                 shopList: [],
                 loading:false,
                 total: 0,
@@ -175,49 +178,65 @@
                     },
                     {
                         title: '推广员姓名',
-                        key: 'shopName',
-                        width:120
+                        width:120,
+                        render: (h, params) => {
+                            return h('span', params.row.promoterInfo.name);
+                        }
                     },
                     {
                         title: '推广员手机号',
-                        key: 'shopPhone',
-                        width:120
-                    },
-                    {
-                        title: '身份证号码',
-                        key: 'shopCode',
-                        width:160
-                    },
-                    
+                        width:120,
+                        render: (h, params) => {
+                            return h('span', params.row.promoterInfo.phone);
+                        }
+                    },                    
                     {
                         title: '零售公司',
                         key: 'companyName',
-                        width:150
+                        width:150,
+                        render: (h, params) => {
+                            return h('span', params.row.organizational.name);
+                        }
                     },
                     {
                         title: '零售公司编号',
                         key: 'companyCode',
-                        width:80
+                        width:80,
+                        render: (h, params) => {
+                            return h('span', params.row.organizational.code);
+                        }
                     },
                     {
                         title: '店铺',
                         key: 'storeName',
-                        width:160
+                        width:160,
+                        render: (h, params) => {
+                            return h('span', params.row.store.name);
+                        }
                     },
                     {
                         title: '店铺编号',
                         key: 'storeNO',
-                        width:80
+                        width:80,
+                        render: (h, params) => {
+                            return h('span', params.row.store.code);
+                        }
                     },
                     {
                         title: '发展人',
                         key: 'fissionNum',
-                        width:80
+                        width:80,
+                        render: (h, params) => {
+                            return h('span', params.row.fissionUser.name);
+                        }
                     },
                     {
-                        title: '提交时间',
-                        key: 'submitDate',
-                        width:120
+                        title: '加入时间',
+                        key: 'joinTime',
+                        width:120,
+                        render: (h, params) => {
+                            return h('span', formatDate(params.row.joinTime));
+                        }
                     },
                     {
                         title: '操作',
@@ -226,18 +245,7 @@
                     }
                 ],
                 data1:[
-                    {
-                        shopName:'张继军',
-                        shopPhone:'13819890111',
-                        shopCode:'110001199010018171',
-                        bankCard:'62210199918822121',
-                        companyName:'上海零售公司',
-                        companyCode:'601',
-                        storeName:'上海波司登',
-                        storeNO:'1001',
-                        fissionNum:'王超看',
-                        submitDate:'2020/05/21'
-                    }
+                    
                 ],
                 columns2: [
                     {
@@ -398,18 +406,22 @@
                     }
                 ],
                 selectDate: [],
+                store:null,
+                remark:null
             }
         },
         mounted: function () {
-            let startDate = this.$moment().format("YYYY-MM-DD");
-            let endDate = this.$moment().format("YYYY-MM-DD");
-            this.selectDate.push(startDate);
-            this.selectDate.push(endDate);
+            // let startDate = this.$moment().format("YYYY-MM-DD");
+            // let endDate = this.$moment().format("YYYY-MM-DD");
+            // this.selectDate.push(startDate);
+            // this.selectDate.push(endDate);
             this.getSelectList();            
             this.downShopData();
+            this.getRecruitList();
         },
         methods: {
             onChangeDateLister(date) {
+                console.log(date)
                 this.selectDate = date;
             },
             /**基础数据：区域list、零售公司list、客户list*/
@@ -483,7 +495,7 @@
             },            
             searchCustomerDataBtnClick: function () {
                 this.pageNum = 1;
-                this.getCheckList();
+                this.getRecruitList();
             },
             // 双击row跳转详情页面
             onDblClickRowLister: function (row) {
@@ -492,27 +504,25 @@
             //切页处理
             handlePage: function (value) {
                 this.pageNum = value;
-                this.getCheckList();
+                this.getRecruitList();
             },
-            getCheckList() {
+            getRecruitList() {
                 let that = this;
                 this.loading = true;
-
                 let request = {
-                    userId: that.userId,
-                    regionId: that.changeData(that.regionId),
-                    companyId: that.changeData(that.companyId),
-                    storeId: that.changeData(that.selectedStore),
+                    status:that.tabIndex+2,
                     pageNum: that.pageNum,
-                    pageSize: that.pageSize,
-                    code: that.searchShop
+                    storeId:that.selectedStore,
+                    companyId: that.companyId,
+                    store:that.searchShop,
+                    start:that.selectDate[0] === ""||that.selectDate.length==0?null:that.selectDate[0],
+                    end:that.selectDate[1] === ""||that.selectDate.length==0?null:that.selectDate[1],
                 };
-                http.checkList(request, function (data) {
-                    data = data.data;
+                bulletinService.getRecruitList(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;
@@ -522,7 +532,8 @@
                         if (datas.list == null) {
                             datas.list = [];
                         }
-                        that.data1 = datas.list;
+                        
+                        that.data1 = datas.records;
                     }
                 }, function (error) {
                     that.loading = false;
@@ -530,14 +541,23 @@
             },
             onTabClick(e){
                 this.tabIndex = e;
-                console.log('tabIndex',this.tabIndex);
+                this.pageNum= 1;
+                this.storeId=null;
+                this.companyId= null;
+                this.searchShop=null;
+                this.selectDate=[];
             },
             ok() {
                 this.refuseIsShow = false;
             },
             // 拒绝审核
-            refuse(index) {
-                console.log(123);                
+            refuse(rData) {
+                let param = {
+                    fissionPromoterId:rData.id,
+                    status:4,
+                    remark:this.remark
+                }
+                this.doRecruitSave(param);
                 this.refuseIsShow = false;
             },
             refuseShow(index) {
@@ -552,10 +572,28 @@
               this.passIsShow = false;
             },
             //确认通过审核         
-            confirm(index) {
-                console.log('确认通过审核');                
+            confirm(rData) {
+                let param = {
+                    fissionPromoterId:rData.id,
+                    status:3
+                }
+                this.doRecruitSave(param);
                 this.passIsShow = false;
             },
+            // 审核
+            doRecruitSave(request){
+                let that = this;
+                bulletinService.recruitSave(request, function (data) {
+                    that.loading = false;
+                    if (data.data.code == "0000") {
+                        that.$Message.info("审核通过");
+                    }else{
+                        that.$Message.error("系统异常");
+                    }
+                }, function (error) {
+                    that.loading = false;
+                });
+            }
         }
     }
 </script>
diff --git a/src/pages/recruit/PromoterList.vue b/src/pages/recruit/PromoterList.vue
index a119af7..c997504 100644
--- a/src/pages/recruit/PromoterList.vue
+++ b/src/pages/recruit/PromoterList.vue
@@ -5,10 +5,9 @@
                 <Row class="row-style">
                     <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop"/>
                     <span class="search-span">选择日期</span>
-                    <DatePicker v-model="date" class="left-15 date-picker" type="date"
-                        placement="bottom-start"
-                        split-panels placeholder="请选择日期">
-                    </DatePicker>
+                   <DatePicker :value="selectDate" type="daterange" split-panels placeholder="请选择日期"
+                                @on-change="onChangeDateLister"
+                                class="date-picker"></DatePicker>
                     <span class="search-span">零售公司</span>
                     <Select v-model="companyId" filterable class="search-select" @on-change="companySelect">
                         <Option v-for="(item,index) in companyList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
@@ -65,9 +64,11 @@
 </template>
 
 <script>
-  import recruitTable from "./recruitTable";
-  import zeroExtend from "../../services/customer/zeroExtend";
-  import staff from "../../services/staff/staff";
+    import recruitTable from "./recruitTable";
+    import zeroExtend from "../../services/customer/zeroExtend";
+    import staff from "../../services/staff/staff";
+    import { formatDate } from "../../utils/Common";
+    import bulletinService from '../../services/recruit/Bulletin'
     export default {
         name: "",
         components: {
@@ -79,15 +80,15 @@
                 userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
                 searchShop:null,
                 date:"",
-                companyId:0,                
+                companyId:null,                    
                 isShow: false,
                 showStoreName: '',
                 showrecruit:false,
                 recruitSchedule:{},
                 rowData:{},
                 //零售公司list
-                companyList: [],
-                selectedStore: 0,
+                companyList: [],                
+                selectedStore: null,
                 shopList: [],
                 loading:false,
                 //所有组织list
@@ -107,12 +108,18 @@
                     {
                         title: '推广员姓名',
                         key: 'shopName',
-                        width:120
+                        width:120,
+                        render: (h, params) => {
+                            return h('span', params.row.promoterInfo.name);
+                        }
                     },
                     {
                         title: '推广员手机号',
                         key: 'shopPhone',
-                        width:120
+                        width:120,
+                        render: (h, params) => {
+                            return h('span', params.row.promoterInfo.phone);
+                        }
                     },
                     {
                         title: '等级',
@@ -142,28 +149,43 @@
                     {
                         title: '零售公司',
                         key: 'companyName',
-                        width:150
+                        width:150,
+                        render: (h, params) => {
+                            return h('span', params.row.organizational.name);
+                        }
                     },
                     
                     {
                         title: '店铺',
                         key: 'storeName',
-                        width:160
+                        width:160,
+                        render: (h, params) => {
+                            return h('span', params.row.store.name);
+                        }
                     },
                     {
                         title: '店铺编号',
                         key: 'storeNO',
-                        width:80
+                        width:80,
+                        render: (h, params) => {
+                            return h('span', params.row.store.code);
+                        }
                     },
                     {
                         title: '发展人',
                         key: 'fissionNum',
-                        width:80
+                        width:80,
+                        render: (h, params) => {
+                            return h('span', params.row.fissionUser.name);
+                        }
                     },
                     {
                         title: '加入时间',
                         key: 'submitDate',
-                        width:120
+                        width:120,
+                        render: (h, params) => {
+                            return h('span', formatDate(params.row.joinTime));
+                        }
                     },
                     {
                         title: '操作',
@@ -207,28 +229,21 @@
                     }
                 ],
                 data1:[
-                    {
-                        shopName:'张继军',
-                        shopPhone:'13819890111',
-                        level:'二级',
-                        managerNumb:'12',
-                        companyName:'上海零售公司',
-                        extensionNumb:'60',
-                        clientNumb:'20',
-                        performance:'21',                 
-                        storeName:'上海波司登',
-                        storeNO:'1001',
-                        fissionNum:'王超看',
-                        submitDate:'2020/05/21'
-                    }
-                ],
+                   
+                ],                
+                selectDate: [],
             }
         },
         mounted: function () {
             this.getSelectList();            
             this.downShopData();
+            this.getPromoterList();
         },
-        methods: {
+        methods: {            
+            onChangeDateLister(date) {
+                console.log(date)
+                this.selectDate = date;
+            },
             /**基础数据：区域list、零售公司list、客户list*/
             getSelectList: function () {
                 let that = this;
@@ -311,21 +326,18 @@
                 this.pageNum = value;
                 this.getCheckList();
             },
-            getCheckList() {
+            getPromoterList() {
                 let that = this;
                 this.loading = true;
-
                 let request = {
-                    userId: that.userId,
-                    regionId: that.changeData(that.regionId),
-                    companyId: that.changeData(that.companyId),
-                    storeId: that.changeData(that.selectedStore),
                     pageNum: that.pageNum,
-                    pageSize: that.pageSize,
-                    code: that.searchShop
+                    storeId:that.selectedStore,
+                    companyId: that.companyId,
+                    store:that.searchShop,
+                    start:that.selectDate[0] === ""||that.selectDate.length==0?null:that.selectDate[0],
+                    end:that.selectDate[1] === ""||that.selectDate.length==0?null:that.selectDate[1],
                 };
-                http.checkList(request, function (data) {
-                    data = data.data;
+                bulletinService.promoterList(request, function (data) {
                     that.loading = false;
                     if (data.code == "0000") {
                         that.data1 = [];
@@ -339,7 +351,7 @@
                         if (datas.list == null) {
                             datas.list = [];
                         }
-                        that.data1 = datas.list;
+                        that.data1 = datas.records;
                     }
                 }, function (error) {
                     that.loading = false;
@@ -370,6 +382,11 @@
             },
         }
     }
+    
+// 列表: /fission/promoter/list
+// 查看上下级: /fission/promoter/detail
+// 升级: /fission/promoter/upgrade
+// 列表的数据结构和招募审核列表的数据结构一致
 </script>
 
 <style scoped>
diff --git a/src/services/recruit/Bulletin.js b/src/services/recruit/Bulletin.js
index 4f4da1c..f01b3f7 100644
--- a/src/services/recruit/Bulletin.js
+++ b/src/services/recruit/Bulletin.js
@@ -1,15 +1,41 @@
 import http from '../CommonHttp'
 import axios from 'axios'
-
+//招募令
 export function getDetail(params, call) {
   return http.get('/fission/detail', params).then(call)
 }
-
+//招募令保存
 export function dosave(params, call) {
   return http.post('/fission/save', params).then(call)
 }
+//招募审核列表
+export function getRecruitList(params, call) {
+  return http.get('/fission/recruit/list', params).then(call)
+}
+// 招募审核保存
+export function recruitSave(params, call) {
+  return http.post('/fission/recruit/save', params).then(call)
+}
+//推广员管理 列表
+export function promoterList(params, call) {
+  return http.get('/fission/promoter/list', params).then(call)
+}
+//推广员管理 查看看上下级
+export function promoterDetail(params, call) {
+  return http.post('/fission/promoter/detail', params).then(call)
+}
+//推广员管理 升级
+export function promoterUpgrade(params, call) {
+  return http.post('/fission/promoter/upgrade', params).then(call)
+}
+
 
 export default {
   getDetail,
-  dosave
+  dosave,
+  getRecruitList,
+  recruitSave,
+  promoterList,
+  promoterDetail,
+  promoterUpgrade
 }
diff --git a/vue.config.js b/vue.config.js
index b99334e..851416f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -30,7 +30,7 @@ module.exports = {
     /* 使用代理 后台接口路径 */
     // proxy: 'http://192.168.1.123:8312/'
     // proxy: 'http://192.168.31.177:8312/'
-    proxy: 'http://localhost:8312/',
+    proxy: 'http://111.231.218.44:8080/',
     // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
   },
 }