修改佣金列表

pingan/src/views/user/cmmssn/components/user-search.vue

@@ -7,8 +7,25 @@
     @submit.native.prevent
   >
     <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="类型:">
+          <el-select v-model="where.type" clearable>
+            <el-option
+              v-for="(item, index) in typeList"
+              :key="index"
+              :label="item.name"
+              :value="item.type"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="来源车型:">
+          <brand-select v-model="where.brands" type="provinceCity" />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
-        <el-form-item label="筛选日期:">
+        <el-form-item label="线索时间:">
           <el-date-picker
             unlink-panels
             v-model="where.dateRange"
@@ -22,6 +39,21 @@
           />
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
+        <el-form-item label="结算时间:">
+          <el-date-picker
+            unlink-panels
+            v-model="where.SettleDateRange"
+            range-separator="-"
+            type="daterange"
+            end-placeholder="结束日期"
+            start-placeholder="开始日期"
+            :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd"
+            class="ele-fluid"
+          />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <div class="ele-form-actions">
           <el-button
@@ -40,17 +72,20 @@
 </template>
 
 <script>
+  import BrandSelect from '@/components/BrandSelect/index.vue';
+
   export default {
+    components: { BrandSelect },
     data() {
       // 默认表单数据
       const defaultWhere = {
-        dateRange: ''
+        type: '',
+        dateRange: '',
+        SettleDateRange: ''
       };
       return {
         // 表单数据
         where: { ...defaultWhere },
-        // 日期范围选择
-        dateRange: [],
         // 日期时间选择器快捷项
         pickerOptions: {
           shortcuts: [
@@ -100,7 +135,11 @@
               }
             }
           ]
-        }
+        },
+        typeList: [
+          { type: 1, name: '线索' },
+          { type: 2, name: '订单' }
+        ]
       };
     },
     computed: {
@@ -117,6 +156,7 @@
       /*  重置 */
       reset() {
         this.where = {};
+        this.$emit('search', this.where);
       }
     }
   };

pingan/src/views/user/cmmssn/index.vue

@@ -43,10 +43,15 @@
         // 表格列配置
         columns: [
           {
-            prop: 'fromCn',
-            label: '佣金来源',
+            prop: 'cluesCid',
+            label: '线索编号',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
+          {
+            prop: 'brandSeries',
+            label: '来源车型',
             showOverflowTooltip: true,
-            slot: 'username',
             align: 'center',
             minWidth: 100
           },
@@ -65,8 +70,8 @@
             align: 'center'
           },
           {
-            prop: 'createTime',
-            label: '时间',
+            prop: 'cluesTime',
+            label: '线索时间',
             align: 'center',
             minWidth: 100,
             resizable: false,