711

src/components/channelConversionList/index.vue → src/components/conversionList/channelConversionList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"

src/components/channelGoodsConversionList/index.vue → src/components/conversionList/channelGoodsConversionList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"
@@ -18,7 +18,16 @@
       <el-form-item label="渠道类型">
         <el-input v-model="searchFrom.invite_type" style="width: 110px"></el-input>
       </el-form-item>
-
+      <el-form-item label="商品名称">
+          <el-select v-model="goodsId" filterable placeholder="请选择" style="width: 150px" @change="onSearch" clearable>
+            <el-option
+              v-for="(data,index) in goodList"
+              :key="index"
+              :label="data | filterGoods"
+              :value="data.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
       <el-form-item>
         <div class="flexRow">
           <el-button type="primary" plain @click="seachData">搜索</el-button>
@@ -148,6 +157,11 @@ export default {
       ]
     };
   },
+  filters(){
+    // filterGoods(val){
+    //     return '['+val.id+']['  + GOODSTYPE[val.goods_type] + ']' + '【' +val.current_price / 100 + '元】' + val.name
+    //   }
+  },
   components: { page },
   methods: {
     seachData() {

src/components/channelTransList/index.vue → src/components/conversionList/channelTransList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"

src/components/periodsConversionList/index.vue → src/components/conversionList/periodsConversionList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"

src/components/squadConversionList/index.vue → src/components/conversionList/squadConversionList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"

src/components/teacherConversionList/index.vue → src/components/conversionList/teacherConversionList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"

src/components/teacherPeriodsConversionList/index.vue → src/components/conversionList/teacherPeriodsConversionList.vue

 <template>
   <div class="channel-trans-list">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" inline>
-      <el-form-item label="起止日期">
+      <el-form-item label="进量日期">
         <el-date-picker
           v-model="searchFrom.payTime"
           type="datetimerange"

src/util/menuList.js

@@ -334,7 +334,7 @@ export default [{
       router: {
         path: '/channelTransList',
         name: 'channelTransList',
-        component: e => require(['@/components/channelTransList'], e),
+        component: e => require(['@/components/conversionList/channelTransList'], e),
       }
     },
     {
@@ -345,7 +345,7 @@ export default [{
         router: {
             path: '/channelGoodsConversionList',
             name: 'channelGoodsConversionList',
-            component: e => require(['@/components/channelGoodsConversionList'], e),
+            component: e => require(['@/components/conversionList/channelGoodsConversionList'], e),
         }
     },
       {
@@ -356,7 +356,7 @@ export default [{
           router: {
               path: '/channelConversionList',
               name: 'channelConversionList',
-              component: e => require(['@/components/channelConversionList'], e),
+              component: e => require(['@/components/conversionList/channelConversionList'], e),
           }
       },
       {
@@ -367,7 +367,7 @@ export default [{
           router: {
               path: '/periodsConversionList',
               name: 'periodsConversionList',
-              component: e => require(['@/components/periodsConversionList'], e),
+              component: e => require(['@/components/conversionList/periodsConversionList'], e),
           }
       },
       {
@@ -378,7 +378,7 @@ export default [{
           router: {
               path: '/squadConversionList',
               name: 'squadConversionList',
-              component: e => require(['@/components/squadConversionList'], e),
+              component: e => require(['@/components/conversionList/squadConversionList'], e),
           }
       },
       {
@@ -389,7 +389,7 @@ export default [{
           router: {
               path: '/teacherConversionList',
               name: 'teacherConversionList',
-              component: e => require(['@/components/teacherConversionList'], e),
+              component: e => require(['@/components/conversionList/teacherConversionList'], e),
           }
       },
       {
@@ -400,7 +400,7 @@ export default [{
           router: {
               path: '/teacherPeriodsConversionList',
               name: 'teacherPeriodsConversionList',
-              component: e => require(['@/components/teacherPeriodsConversionList'], e),
+              component: e => require(['@/components/conversionList/teacherPeriodsConversionList'], e),
           }
       }
   ]