From 5c4d15a0dc76d4e7cd3c67713560e1adb13d70fd Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Fri, 19 Jun 2020 14:32:52 +0800
Subject: [PATCH] 1

---
 src/pages/recruit/CheckList.vue    | 10 +++++-----
 src/pages/recruit/PromoterList.vue |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pages/recruit/CheckList.vue b/src/pages/recruit/CheckList.vue
index 1510c8b..d6b29b6 100644
--- a/src/pages/recruit/CheckList.vue
+++ b/src/pages/recruit/CheckList.vue
@@ -312,7 +312,7 @@ export default {
           }
         },
         {
-          title: "加入时间",
+          title: "提交时间",
           width: 120,
           render: (h, params) => {
             return h("span", formatDate(params.row.joinTime));
@@ -387,14 +387,14 @@ export default {
           }
         },
         {
-          title: "导购",
+          title: "发展人",
           width: 80,
           render: (h, params) => {
             return h("span", params.row.fissionUser.name);
           }
         },
         {
-          title: "加入时间",
+          title: "提交时间",
           width: 120,
           render: (h, params) => {
             return h("span", formatDate(params.row.joinTime));
@@ -472,14 +472,14 @@ export default {
           }
         },
         {
-          title: "导购",
+          title: "发展人",
           width: 80,
           render: (h, params) => {
             return h("span", params.row.fissionUser.name);
           }
         },
         {
-          title: "加入时间",
+          title: "提交时间",
           width: 120,
           render: (h, params) => {
             return h("span", formatDate(params.row.joinTime));
diff --git a/src/pages/recruit/PromoterList.vue b/src/pages/recruit/PromoterList.vue
index 56ad3ba..0dd612a 100644
--- a/src/pages/recruit/PromoterList.vue
+++ b/src/pages/recruit/PromoterList.vue
@@ -393,6 +393,12 @@ export default {
         start: that.selectDate[0] === "" || that.selectDate.length == 0 ? null : that.selectDate[0],
         end: that.selectDate[1] === "" || that.selectDate.length == 0 ? null : that.selectDate[1],
       };
+      if (request.storeId <= 0) {
+        request.storeId = undefined
+      }
+      if (request.companyId <= 0) {
+        request.companyId = undefined
+      }
       bulletinService.promoterList(request, function (data) {
         that.loading = false;
         if (data.data.code == "0000") {