From f19cd852a2d54776b0f419db874cc5e7e17368bd Mon Sep 17 00:00:00 2001
From: liuyang <396235408@qq.com>
Date: Mon, 15 Jun 2020 02:01:29 +0800
Subject: [PATCH] 1

---
 src/pages/activity/ActivityPlan.vue     |  1 -
 src/pages/recruit/CheckList.vue         |  6 +-
 src/pages/recruit/PromoterList.vue      |  1 -
 src/pages/recruit/recruitTable.vue      | 95 +++++++------------------
 src/pages/shop/IncreaseStaffManager.vue |  1 -
 5 files changed, 30 insertions(+), 74 deletions(-)

diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 909e129..2eab968 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -508,7 +508,6 @@ export default {
     },
     // 下载二维码
     download: function (index) {
-      debugger;
       let fileName = index.name + "-门店码";
       http.downloadImg(
         {
diff --git a/src/pages/recruit/CheckList.vue b/src/pages/recruit/CheckList.vue
index 094b534..cde0549 100644
--- a/src/pages/recruit/CheckList.vue
+++ b/src/pages/recruit/CheckList.vue
@@ -474,7 +474,7 @@ export default {
           title: "审核不通过原因",
           width: 120,
           render: (h, params) => {
-            return h("span", formatDate(params.row.remark));
+            return h("span",params.row.fissionUser.remark);
           }
         }
       ],
@@ -596,8 +596,8 @@ export default {
       let request = {
         status: that.tabIndex + 2,
         pageNum: that.pageNum,
-        storeId: that.selectedStore,
-        companyId: that.companyId,
+        storeId: that.selectedStore ==0 ? null:that.selectedStore,
+        companyId: that.companyId ==0 ? null:that.companyId,
         store: that.searchShop,
         start:
           that.selectDate[0] === "" || that.selectDate.length == 0
diff --git a/src/pages/recruit/PromoterList.vue b/src/pages/recruit/PromoterList.vue
index d49f9ed..1e38d3f 100644
--- a/src/pages/recruit/PromoterList.vue
+++ b/src/pages/recruit/PromoterList.vue
@@ -393,7 +393,6 @@
                 this.rowData = index;
             },
             doShow (currData,ishow) {
-                debugger
                 this.showrecruit = false;
                 let that = this;
                 let param = {
diff --git a/src/pages/recruit/recruitTable.vue b/src/pages/recruit/recruitTable.vue
index 8e02ff7..68f4548 100644
--- a/src/pages/recruit/recruitTable.vue
+++ b/src/pages/recruit/recruitTable.vue
@@ -6,19 +6,27 @@
       @on-cancel="cancel"
       :loading="true"
       width="70%">
-      <div class="m-info">
+      <div v-if="isShow" class="m-info">
         <div class="m-info-top">
           <p>所属零售公司：{{schedule.organizational.name}}</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">
-            
-        </Table>
+        <div>
+          <div class="t-rows">
+            <div>{{schedule.fissionUser.name}}</div>
+            <div>{{schedule.fissionUser.mobil}}</div>
+            <div>服务经理</div>
+          </div>
+        </div>
         <div  class="m-subordinate">下级(35人)</div>
-        <Table ref="table" style="width:100%!important" :show-header="false" :loading="loading" :columns="columns2" :data="data2" class="table-store">
-          
-        </Table>
+        <div>
+        <div class="t-rows">
+          <div>张胜男</div>
+          <div>13123209313</div>
+          <div>推广员</div>
+        </div>
+      </div>
       </div>
       <div slot="footer">
       
@@ -35,70 +43,11 @@ export default {
   },
   data () {
     return {
+      isShow:false,
       currentStep: 0,
       modal_loading: false,
       loading:false,
       showUse: false,
-      columns1: [
-                    {
-                        title: '上级姓名',
-                        key: 'superiorName',
-                        width:120
-                    },
-                    {
-                        title: '上级手机号',
-                        key: 'superiorPhone',
-                        width:140
-                    },
-                    {
-                        title: '职务',
-                        key: 'superiorDuty',
-                        width:160
-                    }
-                ],
-      data1:[
-          {
-              superiorName:'张继军',
-              superiorPhone:'13819890111',
-              superiorDuty:'服务经理',
-              
-          }
-      ],
-      columns2: [
-                    {
-                        title: '下级姓名',
-                        key: 'subordinateName',
-                        width:120
-                    },
-                    {
-                        title: '下级手机号',
-                        key: 'subordinatePhone',
-                        width:130
-                    },
-                    {
-                        title: '职务',
-                        key: 'subordinateDuty',
-                        width:160
-                    }
-                ],
-      data2:[
-          {
-              subordinateName:'张军',
-              subordinatePhone:'13119011110',
-              subordinateDuty:'推广员',              
-          },
-          {
-              subordinateName:'王凯',
-              subordinatePhone:'13123209313',
-              subordinateDuty:'推广员',              
-          },
-          {
-              subordinateName:'陈涵',
-              subordinatePhone:'13119024321',
-              subordinateDuty:'推广员',              
-          },
-          
-      ],
     };
   },
   props: {
@@ -119,7 +68,8 @@ export default {
       this.showUse = this.show;
     },
     schedule(){
-      console.log('schedule监听',this.schedule)
+      console.log('schedule监听',this.schedule);
+      this.isShow = true;
     }
   },
   mounted () { },
@@ -145,4 +95,13 @@ export default {
     padding: 10px 0 10px 10px;
     background-color: #f5f7f9;
   }
+  .t-rows{
+    display: flex;
+
+  }
+  .t-rows div{
+    margin-right: 40px;
+    line-height: 45px;
+    padding-left: 20px;
+  }
 </style>
diff --git a/src/pages/shop/IncreaseStaffManager.vue b/src/pages/shop/IncreaseStaffManager.vue
index 60bbe79..6ece9c2 100644
--- a/src/pages/shop/IncreaseStaffManager.vue
+++ b/src/pages/shop/IncreaseStaffManager.vue
@@ -552,7 +552,6 @@
             },
             // switch开关
             modifyStatus(accountId, val) {
-              debugger
                 let that = this;
                 let status;
                 if (val) {