Merge remote-tracking branch 'origin/master'

src/modules/customer/views/Index.vue

@@ -2,7 +2,7 @@
   <app-card class="customer">
     <app-list v-bind="tableOptions" ref="list" searchResetSeparateLine>
       <template #filter-bar-right>
-        <el-button type="primary" size="small" @click="dialogVisable = true">创建客户</el-button>
+        <el-button type="primary" size="small" @click="dialogVisible = true">创建客户</el-button>
       </template>
       <!-- 筛选 -->
       <template v-slot:filter-date="{ params }">
@@ -19,8 +19,11 @@
       <template v-slot:filter-region="{ params }">
         <app-area v-model="params.region"></app-area>
       </template>
-      <template v-slot:filter-userSearch="{ params }">
-        <app-user-search v-model="params.created_by"></app-user-search>
+      <template v-slot:filter-create-by="{ params }">
+        <app-user-search v-model="params.created_by" :options="{ clearable: true }"></app-user-search>
+      </template>
+      <template v-slot:filter-project-ssoid="{ params }">
+        <app-user-search v-model="params.project_sso_id" :options="{ clearable: true }"></app-user-search>
       </template>
       <template v-slot:filter-follow-date="{ params }">
         <el-date-picker
@@ -110,16 +113,18 @@ export default {
             project_tag: '',
             project_status: '',
             project_sso_id: '',
-            last_record_start_time: '',
-            last_record_end_time: '',
-            created_start_time: '',
-            created_end_time: ''
+            // last_record_start_time: '',
+            // last_record_end_time: '',
+            // created_start_time: '',
+            // created_end_time: '',
+            create_date: '',
+            follow_date: ''
           }
         },
         filters: [
           { prop: 'create_date', slots: 'filter-date', label: '创建时间：', class: 'filter-form-item' },
           { prop: 'follow_date', slots: 'filter-follow-date', label: '最近跟进时间：' },
-          { prop: 'created_by', slots: 'filter-userSearch', label: '创建员工：' },
+          { prop: 'created_by', slots: 'filter-create-by', label: '创建员工：' },
           // {
           //   type: 'select',
           //   placeholder: '请选择创建员工',
@@ -161,7 +166,7 @@ export default {
           {
             type: 'select',
             placeholder: '请选择合作项目',
-            prop: 'project',
+            prop: 'project_tag',
             options: this.projectList,
             labelKey: 'name',
             valueKey: 'id',
@@ -171,23 +176,14 @@ export default {
           {
             type: 'select',
             placeholder: '请选择项目进度',
-            prop: 'progress',
+            prop: 'project_status',
             options: this.progressList,
             labelKey: 'name',
             valueKey: 'id',
             size: 'small',
             label: '项目进度：'
           },
-          {
-            type: 'select',
-            placeholder: '请选择项目负责人',
-            prop: 'director',
-            options: [],
-            labelKey: 'name',
-            valueKey: 'id',
-            size: 'small',
-            label: '项目负责人：'
-          },
+          { prop: 'project_sso_id', slots: 'filter-project-ssoid', label: '项目负责人：' },
           { prop: 'region', slots: 'filter-region', label: '所在地区：' }
         ],
         data: [