Merge branch 'dev-baomu' of http://47.102.110.240:3000/yuxiangpei/jzlife_vue_report into dev-baomu

src/components/caocf/KaoCom.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="background-color: white;"> 
+    <div style="background-color: white;">
         <!-- 查询和其他操作 -->
         <div class="filter-container" style="padding: 10px">
             <el-form :inline="true" size="small" v-model="listQuery">
@@ -7,7 +7,7 @@
                     <el-date-picker v-model="timeArray" type="daterange" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
                         class="filter-item" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                         :picker-options="pickerOptions" />
-                </el-form-item> 
+                </el-form-item>
                 <el-form-item>
                     <el-button class="filter-item" type="primary" icon="el-icon-search"
                         @click="handleFilter()">查找</el-button>
@@ -18,14 +18,15 @@
         </div>
 
         <!-- 查询结果 -->
-        <el-table :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row> 
+        <el-table :data="list" element-loading-text="正在查询中。。。" border fit highlight-current-row>
             <el-table-column align="center" label="城市" prop="city" />
             <el-table-column align="center" label="预约日期" prop="bookDate" />
             <el-table-column align="center" label="订单渠道" prop="orderChannel" />
-            <el-table-column align="center" label="购买商品" prop="goodsName" /> 
-            <el-table-column align="center" label="预约次数" prop="serviceTime" /> 
-            <el-table-column align="center" label="已完成数量" prop="servicedTime" /> 
-            <el-table-column align="center" label="已完成服务GMV" prop="gmv" /> 
+            <el-table-column align="center" label="购买商品" prop="goodsName" />
+            <el-table-column align="center" label="二级分类" prop="levelTwo" />
+            <el-table-column align="center" label="预约次数" prop="serviceTime" />
+            <el-table-column align="center" label="已完成数量" prop="servicedTime" />
+            <el-table-column align="center" label="已完成服务GMV" prop="gmv" />
         </el-table>
 
         <pagination v-show="total > 0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit"
@@ -43,8 +44,8 @@ export default {
     name: "KaoCom",
     components: { Pagination },
     data() {
-        return { 
-            listLoading: false, 
+        return {
+            listLoading: false,
             timeArray: [
                 this.formateDay(new Date(new Date() - 3600 * 1000 * 24 * 7)),
                 this.formateDay(new Date()),
@@ -54,7 +55,7 @@ export default {
             listQuery: {
                 page: 1,
                 limit: 20,
-                order: "desc" 
+                order: "desc"
             },
             pickerOptions: {
                 shortcuts: [
@@ -94,7 +95,7 @@ export default {
     },
     methods: {
         getBookList(isExport) {
-            console.info(this.timeArray); 
+            console.info(this.timeArray);
             if (this.timeArray && this.timeArray.length === 2) {
                 this.listQuery.startTime = this.timeArray[0];
                 this.listQuery.endTime = this.timeArray[1];
@@ -111,7 +112,7 @@ export default {
                 page: this.listQuery.page,
                 limit: this.listQuery.limit,
                 startTime: this.listQuery.startTime,
-                endTime: this.listQuery.endTime, 
+                endTime: this.listQuery.endTime,
                 isExport: isExport
             }
 
@@ -214,4 +215,4 @@ export default {
     margin-top: 10px;
     color: #36a3f7;
 }
-</style>
+</style>

src/router/index.js

@@ -17,6 +17,7 @@ import serviceQualityDetail from "@/components/serviceQualityDetail";
 import serviceAbilityDetail from "@/components/serviceAbilityDetail";
 import servantDetail from "@/components/servantDetail";
 import nannyData from "@/components/nannyData";
+import nannyDataNew from "@/components/nannyDataNew";
 import marketRebuyRemind from "@/components/marketRebuyRemind"
 
 import callTask from "@/components/callTask"; //电访任务报表
@@ -124,6 +125,14 @@ const router = new Router({
                     title: "销售活动"
                 }
             },
+            {
+              path: "nannyDataNew",
+              name: "nannyDataNew",
+              component: nannyDataNew,
+              meta: {
+                title: "三嫂列表数据"
+              }
+            },
 
         ]
 
@@ -288,7 +297,7 @@ const router = new Router({
                     title: "电访任务报表"
                 }
             },
-          
+
             {
                 path: "serviceQualityDataHm",
                 name: "serviceQualityDataHm",
@@ -340,7 +349,7 @@ const router = new Router({
                     title: "服务力明细"
                 }
             },
-           
+
             {
                 path: "serviceSalary",
                 name: "serviceSalary",
@@ -456,7 +465,7 @@ const router = new Router({
                     title: "报表浏览记录"
                 }
             }
-           
+
         ]
     },
 
@@ -482,9 +491,9 @@ const router = new Router({
             meta: {
                 title: "销售履约"
             }
-        }] 
+        }]
     },
-   
+
     {
         path: "/targetImport",
         name: "TargetImport",
@@ -560,7 +569,7 @@ const router = new Router({
                 title: "服务Gmv统计报表"
             }
         },
- 
+
 
 
         ]