From 25480d6d51e3c3ec3a2788193e73c13b7de03d87 Mon Sep 17 00:00:00 2001
From: liuyang <396235408@qq.com>
Date: Sat, 13 Jun 2020 19:55:57 +0800
Subject: [PATCH] 1

---
 src/pages/recruit/CheckList.vue    | 48 +++++++++--------
 src/pages/recruit/PromoterList.vue | 87 +++++++++++++++++++++++-------
 src/pages/recruit/recruitTable.vue | 75 ++------------------------
 3 files changed, 100 insertions(+), 110 deletions(-)

diff --git a/src/pages/recruit/CheckList.vue b/src/pages/recruit/CheckList.vue
index 294926b..02204dd 100644
--- a/src/pages/recruit/CheckList.vue
+++ b/src/pages/recruit/CheckList.vue
@@ -7,10 +7,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>
@@ -169,7 +168,10 @@
                     {
                         title: '序号',
                         key: 'number',
-                        width:60
+                        width:60,
+                        render: (h, params) => {
+                            return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1);
+                        }
                     },
                     {
                         title: '推广员姓名',
@@ -186,11 +188,7 @@
                         key: 'shopCode',
                         width:160
                     },
-                    {
-                        title: '银行卡号',
-                        key: 'bankCard',
-                        width:150
-                    },
+                    
                     {
                         title: '零售公司',
                         key: 'companyName',
@@ -245,7 +243,10 @@
                     {
                         title: '序号',
                         key: 'number',
-                        width:60
+                        width:60,
+                        render: (h, params) => {
+                            return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1);
+                        }
                     },
                     {
                         title: '推广员姓名',
@@ -262,11 +263,7 @@
                         key: 'shopCode',
                         width:160
                     },
-                    {
-                        title: '银行卡号',
-                        key: 'bankCard',
-                        width:150
-                    },
+                    
                     {
                         title: '零售公司',
                         key: 'companyName',
@@ -322,7 +319,10 @@
                     {
                         title: '序号',
                         key: 'number',
-                        width:60
+                        width:60,
+                        render: (h, params) => {
+                            return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1);
+                        }
                     },
                     {
                         title: '推广员姓名',
@@ -339,11 +339,7 @@
                         key: 'shopCode',
                         width:160
                     },
-                    {
-                        title: '银行卡号',
-                        key: 'bankCard',
-                        width:150
-                    },
+                    
                     {
                         title: '零售公司',
                         key: 'companyName',
@@ -401,13 +397,21 @@
                         refuseInfo:'信息不完善'
                     }
                 ],
+                selectDate: [],
             }
         },
         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);
             this.getSelectList();            
             this.downShopData();
         },
         methods: {
+            onChangeDateLister(date) {
+                this.selectDate = date;
+            },
             /**基础数据：区域list、零售公司list、客户list*/
             getSelectList: function () {
                 let that = this;
diff --git a/src/pages/recruit/PromoterList.vue b/src/pages/recruit/PromoterList.vue
index 032e15a..a119af7 100644
--- a/src/pages/recruit/PromoterList.vue
+++ b/src/pages/recruit/PromoterList.vue
@@ -99,7 +99,10 @@
                     {
                         title: '序号',
                         key: 'number',
-                        width:60
+                        width:60,
+                        render: (h, params) => {
+                            return h('span', params.index + (this.pageNum - 1) * this.pageSize + 1);
+                        }
                     },
                     {
                         title: '推广员姓名',
@@ -112,25 +115,36 @@
                         width:120
                     },
                     {
-                        title: '身份证号码',
-                        key: 'shopCode',
-                        width:160
+                        title: '等级',
+                        key: 'level',
+                        width:80
                     },
                     {
-                        title: '银行卡号',
-                        key: 'bankCard',
-                        width:150
+                        title: '客户经理数',
+                        key: 'managerNumb',
+                        width:120
                     },
                     {
-                        title: '零售公司',
-                        key: 'companyName',
-                        width:150
+                        title: '推广员数',
+                        key: 'extensionNumb',
+                        width:120
                     },
                     {
-                        title: '零售公司编号',
-                        key: 'companyCode',
+                        title: '客户数',
+                        key: 'clientNumb',
                         width:80
                     },
+                    {
+                        title: '业绩',
+                        key: 'performance',
+                        width:80
+                    },
+                    {
+                        title: '零售公司',
+                        key: 'companyName',
+                        width:150
+                    },
+                    
                     {
                         title: '店铺',
                         key: 'storeName',
@@ -147,24 +161,61 @@
                         width:80
                     },
                     {
-                        title: '提交时间',
+                        title: '加入时间',
                         key: 'submitDate',
                         width:120
                     },
                     {
                         title: '操作',
-                        slot: 'action',
-                        width:250
+                        slot: 'operation',
+                        width:250,
+                        render: (h, params) => {
+                            let that = this;
+                            return h('div', [
+                                 h('span', {
+                                    style: {
+                                        background: 'white',
+                                        border: '0',
+                                        color: '#3496EB',
+                                        marginRight: '15px',
+                                        cursor: 'pointer'
+                                    },
+                                    on: {
+                                        click: () => {
+                                            that.show(params.row)
+                                        }
+                                    }
+                                }, '升级'),
+                                h('span', {
+                                    style: {
+                                        background: 'white',
+                                        border: '0',
+                                        color: '#3496EB',
+                                        marginRight: '15px',
+                                        cursor: 'pointer'
+                                    },
+                                    on: {
+                                        click: () => {
+                                            that.doShow(params.row,true)
+                                        }
+                                    }
+                                }, '查看上下级'),
+                                
+                            ])
+
+                        }
                     }
                 ],
                 data1:[
                     {
                         shopName:'张继军',
                         shopPhone:'13819890111',
-                        shopCode:'110001199010018171',
-                        bankCard:'62210199918822121',
+                        level:'二级',
+                        managerNumb:'12',
                         companyName:'上海零售公司',
-                        companyCode:'601',
+                        extensionNumb:'60',
+                        clientNumb:'20',
+                        performance:'21',                 
                         storeName:'上海波司登',
                         storeNO:'1001',
                         fissionNum:'王超看',
diff --git a/src/pages/recruit/recruitTable.vue b/src/pages/recruit/recruitTable.vue
index 2e38edd..9e4954b 100644
--- a/src/pages/recruit/recruitTable.vue
+++ b/src/pages/recruit/recruitTable.vue
@@ -60,7 +60,7 @@ export default {
           {
               superiorName:'张继军',
               superiorPhone:'13819890111',
-              superiorDuty:'项目经理',
+              superiorDuty:'服务经理',
               
           }
       ],
@@ -85,17 +85,17 @@ export default {
           {
               subordinateName:'张军',
               subordinatePhone:'13119011110',
-              subordinateDuty:'职员',              
+              subordinateDuty:'推广员',              
           },
           {
               subordinateName:'王凯',
               subordinatePhone:'13123209313',
-              subordinateDuty:'职员',              
+              subordinateDuty:'推广员',              
           },
           {
               subordinateName:'陈涵',
               subordinatePhone:'13119024321',
-              subordinateDuty:'职员',              
+              subordinateDuty:'推广员',              
           },
           
       ],
@@ -118,78 +118,13 @@ export default {
     show () {
       this.showUse = this.show;
     },
-    schedule (newData) {
-      console.log('1',newData);
-    },
   },
   mounted () { },
   methods: {
     cancel () {
-      this.$emit("doShow", false);
       this.modal_loading = false;
-      this.showUse = false;
-      this.currentStep = 0;
-    },
-    next () {
-      let data = store.getters.useData;
-      data.name = this.schedule.name;
-      if (this.currentStep === 0) {
-        if (data.params.length <= 0) {
-          this.$Message.error("请选择活动类型");
-          return;
-        }
-        if (!data.beginTime) {
-          this.$Message.error("请填写活动开始时间");
-          return;
-        }
-        if (!data.endTime) {
-          this.$Message.error("请填写活动结束时间");
-          return;
-        }
-        if (data.beginTime > data.endTime) {
-          this.$Message.error("开始时间不能晚于结束时间");
-          return;
-        }
-      }
-      if (this.currentStep === 1) {
-        if (!data.company || data.company.length === 0) {
-          this.$Message.error("请至少选择1家公司");
-          return;
-        }
-      }
-      if (this.currentStep === 2) {
-        if (!data.stores || data.stores.length === 0) {
-          this.$Message.error("请至少选择1家店铺");
-          return;
-        }
-      }
-      if (typeof data.beginTime == "object") {
-        data.beginTime = formatDate(data.beginTime);
-      }
-      if (typeof data.endTime == "object") {
-        data.endTime = formatDate(data.endTime);
-      }
-      console.log("data", data)
-      store.commit("SET_useData", data);
-      this.currentStep = this.currentStep + 1;
-    },
-    back () {
-      this.currentStep = this.currentStep - 1;
-    },
-    finish () {
-      let that = this;
-      let data = store.getters.useData;
-      data.isGetActivityInfo = true;
-      this.modal_loading = true;
-      ActivityManager.saveActivityData(store.getters.useData, function (data) {
-        store.commit("RSET_useData");
-        that.$emit("doShow", false);
-        that.$router.push("/activity/plan");
-        that.currentStep = 0;
-        that.modal_loading = false;
-        that.showUse = false;
-      });
     },
+   
   },
 };
 </script>