刘恒 1 год назад
Родитель
Сommit
ba911878c9

+ 2 - 1
src/pages/personnelManage/front/personnel.vue

@@ -346,11 +346,11 @@ export default {
     getRankingList() {
       this.$API.personnel
         .getRankingList({
-          ...this.rankForm,
           orderSort: this.orderSort,
           managementSource: 2,
           ...this.formState,
           leaderId: this.formState.leaderId[this.formState.leaderId.length - 1],
+          ...this.rankForm,
         })
         .then((res) => {
           // console.log(res);
@@ -369,6 +369,7 @@ export default {
       });
       this.countyList = [...arr];
       this.rankForm.countyId = "";
+      console.log(this.rankForm);
       this.getRankingList();
     },
     //获取省市区列表

+ 2 - 1
src/pages/personnelManage/sales.vue

@@ -371,7 +371,7 @@ export default {
     },
     teamMessage(item) {
       // item
-      console.log(this.$router);
+
       this.$router.push({
         path: "/personnelManage/sales/message",
         query: {
@@ -380,6 +380,7 @@ export default {
           totalPremium: item.totalPremium,
           orderManpower: item.orderManpower,
           time: this.formState.time,
+          days: this.formState.days,
         },
       });
     },

+ 4 - 0
src/pages/personnelManage/sales/message.vue

@@ -232,6 +232,8 @@ export default {
       this.formState.time = this.$route.query.time;
       this.formState.createtimeStart = this.$route.query.time[0];
       this.formState.createtimeEnd = this.$route.query.time[1];
+      this.formState.days = this.$route.query.days;
+
       this.getList();
     });
   },
@@ -245,6 +247,7 @@ export default {
         query: {
           userId: item.userId,
           time: this.formState.time,
+          days: this.$route.query.days,
         },
       });
     },
@@ -254,6 +257,7 @@ export default {
         query: {
           userId: item.userId,
           time: this.formState.time,
+          days: this.$route.query.days,
         },
       });
     },

+ 2 - 0
src/pages/personnelManage/sales/order.vue

@@ -379,6 +379,8 @@ export default {
     this.formState.time = this.$route.query.time;
     this.formState.beginDate = this.$route.query.time[0];
     this.formState.endDate = this.$route.query.time[1];
+    this.formState.days = this.$route.query.days;
+
     this.getVerification();
 
     // setTimeout(() => {

+ 1 - 0
src/pages/personnelManage/sales/task.vue

@@ -235,6 +235,7 @@ export default {
     this.formState.time = this.$route.query.time;
     this.formState.beginDate = this.$route.query.time[0];
     this.formState.endDate = this.$route.query.time[1];
+    this.formState.days = this.$route.query.days;
 
     this.getList();
     // setTimeout(() => {

+ 6 - 0
src/pages/task/channel.vue

@@ -326,6 +326,12 @@ const columns = [
     dataIndex: "sumEntryStatus",
     // scopedSlots: { customRender: "qutationCount" },
   },
+  {
+    title: "外部订单",
+    dataIndex: "outStatus",
+    // scopedSlots: { customRender: "outStatus" },
+  },
+
   {
     title: "待审核",
     dataIndex: "auditOrder",