add

src/views/crm/customer/full.vue

@@ -31,8 +31,10 @@
           <el-form-item label="所属部门" prop="deptId">
               <treeselect style="width:205.4px" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属部门" />
           </el-form-item>
+
+
           <el-form-item label="客户状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
+            <el-select  v-model="queryParams.status" placeholder="请选择客户状态" clearable size="small">
               <el-option
                     v-for="item in statusOptions"
                     :key="item.dictValue"
@@ -41,9 +43,20 @@
                   />
             </el-select>
           </el-form-item>
+
+        <el-form-item label="跟进阶段" prop="visitStatus">
+            <el-select  multiple filterable v-model="visitStatusArr" placeholder="请选择跟进阶段" clearable size="small">
+              <el-option
+                    v-for="item in visitStatusOptions"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  />
+            </el-select>
+          </el-form-item>
           
           <el-form-item label="客户类型" prop="customerType">
-            <el-select filterable v-model="queryParams.customerType" placeholder="请选择客户类型" clearable size="small">
+            <el-select multiple filterable v-model="ctsTypeArr" placeholder="请选择客户类型" clearable size="small">
               <el-option
                     v-for="item in typeOptions"
                     :key="item.dictValue"
@@ -52,6 +65,7 @@
                   />
             </el-select>
           </el-form-item>
+          
           <el-form-item label="客户标签" prop="tags">
             <el-select multiple  filterable v-model="tagIds" placeholder="请选择客户标签" clearable size="small">
               <el-option
@@ -86,7 +100,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="客户来源" prop="source">
-            <el-select filterable v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
+            <el-select multiple filterable v-model="sourceArr" placeholder="请选择客户来源" clearable size="small">
               <el-option
                     v-for="item in sourceOptions"
                     :key="item.dictValue"
@@ -247,6 +261,9 @@ export default {
       visitStatusOptions:[],
       tagIds:[],
       tagsOptions:[],
+      visitStatusArr:[],
+      ctsTypeArr:[],
+      sourceArr:[],
       userSelect:{
         title:"选择员工",
         open:false,
@@ -480,6 +497,29 @@ export default {
     /** 查询客户列表 */
     getList() {
       this.loading = true;
+
+      if(this.visitStatusArr.length>0){
+        this.queryParams.visitStatus=this.visitStatusArr.toString();
+      }
+      else{
+        this.queryParams.visitStatus=null
+      }
+
+      if(this.ctsTypeArr.length>0){
+        this.queryParams.customerType=this.ctsTypeArr.toString();
+      }
+      else{
+        this.queryParams.customerType=null
+      }
+
+      if(this.sourceArr.length>0){
+        this.queryParams.source=this.sourceArr.toString();
+      }
+      else{
+        this.queryParams.source=null
+      }
+
+
       if(this.tagIds.length>0){
         this.queryParams.tags=this.tagIds.toString();
       }

src/views/crm/customer/index.vue

@@ -46,7 +46,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="跟进阶段" prop="visitStatus">
-            <el-select style="width:220px" filterable v-model="queryParams.visitStatus" placeholder="请选择跟进阶段" clearable size="small">
+            <el-select style="width:220px" multiple filterable v-model="visitStatusArr" placeholder="请选择跟进阶段" clearable size="small">
               <el-option
                     v-for="item in visitStatusOptions"
                     :key="item.dictValue"
@@ -56,7 +56,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="客户类型" prop="customerType">
-            <el-select style="width:220px" filterable v-model="queryParams.customerType" placeholder="请选择客户类型" clearable size="small">
+            <el-select style="width:220px" multiple filterable v-model="ctsTypeArr" placeholder="请选择客户类型" clearable size="small">
               <el-option
                     v-for="item in typeOptions"
                     :key="item.dictValue"
@@ -108,7 +108,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="客户来源" prop="source">
-            <el-select style="width:220px" filterable v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
+            <el-select style="width:220px" filterable multiple v-model="sourceArr" placeholder="请选择客户来源" clearable size="small">
               <el-option
                     v-for="item in sourceOptions"
                     :key="item.dictValue"
@@ -123,7 +123,7 @@
               <el-option key="0"  label="否" value="0" />
             </el-select>
           </el-form-item>
-          <el-form-item label="历史订单" prop="isHisOrder">
+              <el-form-item label="历史订单" prop="isHisOrder">
             <el-select style="width:220px" filterable v-model="queryParams.isHisOrder" placeholder="请选择历史订单" clearable size="small">
               <el-option key="1"  label="是" value="1" />
               <el-option key="0"  label="否" value="0" />
@@ -358,6 +358,9 @@ export default {
       cityIds:[],
       citys:[],
       tags:[],
+      visitStatusArr:[],
+      ctsTypeArr:[],
+      sourceArr:[],
       inputVisible: false,
       inputValue: '',
       receiveOptions:[],
@@ -417,6 +420,7 @@ export default {
         source: null,
         tags: null,
         tagList:[],
+        visitStatus:null,
       },
       // 表单参数
       form: {
@@ -619,6 +623,28 @@ export default {
     /** 查询客户列表 */
     getList() {
       this.loading = true;
+
+      if(this.visitStatusArr.length>0){
+        this.queryParams.visitStatus=this.visitStatusArr.toString();
+      }
+      else{
+        this.queryParams.visitStatus=null
+      }
+
+      if(this.ctsTypeArr.length>0){
+        this.queryParams.customerType=this.ctsTypeArr.toString();
+      }
+      else{
+        this.queryParams.customerType=null
+      }
+
+      if(this.sourceArr.length>0){
+        this.queryParams.source=this.sourceArr.toString();
+      }
+      else{
+        this.queryParams.source=null
+      }
+ 
       if(this.tagIds.length>0){
         this.queryParams.tags=this.tagIds.toString();
       }

src/views/crm/customer/line.vue

@@ -191,7 +191,7 @@
         <el-table-column label="备注" align="center" prop="remark" width="120"  />
         <el-table-column label="进线客户详情" align="center" :show-overflow-tooltip="true" prop="registerDesc" />
         <el-table-column label="领取时间" align="center" prop="startTime" />
-        <el-table-column label="进线客户提交日期" align="center" prop="registerSubmitTime" />
+        <el-table-column label="进线客户提交日期" align="center" prop="registerSubmitTime" width="130" />
          <el-table-column  label="认领人"  align="center" prop="companyUserNickName" :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" width="100">
@@ -208,8 +208,7 @@
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+        @pagination="getList"/>
 
     
 
@@ -273,7 +272,7 @@ export default {
   data() {
     return {
       visitStatusOptions:[],
-      isDuplicateOptions:[ {"dictLabel":"不限","dictValue":""},{"dictLabel":"重客户","dictValue":1},{"dictLabel":"非重客户","dictValue":2}],
+      isDuplicateOptions:[ {"dictLabel":"不限","dictValue":""},{"dictLabel":"从客户","dictValue":1},{"dictLabel":"非从客户","dictValue":2}],
       tagIds:[],
       tagsOptions:[],
       assignList:{

src/views/crm/customer/my.vue

@@ -32,7 +32,7 @@
         />
       </el-form-item>
       <el-form-item label="跟进阶段" prop="status">
-        <el-select style="width:220px" filterable  v-model="queryParams.status" placeholder="请选择跟进阶段" clearable size="small">
+        <el-select style="width:220px" multiple filterable  v-model="statusArr" placeholder="请选择跟进阶段" clearable size="small">
            <el-option
                 v-for="item in statusOptions"
                 :key="item.dictValue"
@@ -42,7 +42,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="客户类型" prop="customerType">
-        <el-select style="width:220px" filterable  v-model="queryParams.customerType" placeholder="请选择客户类型" clearable size="small">
+        <el-select style="width:220px" multiple filterable  v-model="ctsTypeArr" placeholder="请选择客户类型" clearable size="small">
            <el-option
                 v-for="item in typeOptions"
                 :key="item.dictValue"
@@ -62,7 +62,7 @@
             </el-select>
           </el-form-item>
       <el-form-item label="客户来源" prop="source">
-        <el-select style="width:220px" filterable  v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
+        <el-select style="width:220px" multiple filterable  v-model="sourceArr" placeholder="请选择客户来源" clearable size="small">
            <el-option
                 v-for="item in sourceOptions"
                 :key="item.dictValue"
@@ -77,6 +77,7 @@
               clearable size="small"
               v-model="queryParams.customerCreateTime"
               value-format="yyyy-MM-dd"
+              placeholder="创建时间"
               >
             </el-date-picker>
       </el-form-item>
@@ -175,7 +176,7 @@
       </el-table-column>
       <el-table-column  label="跟进阶段"  width="200" align="center" prop="visitStatus">
         <template slot-scope="scope">
-            <el-tag prop="visitStatus" v-for="(item, index) in statusOptions"    v-if="scope.row.visitStatus==item.dictValue">{{item.dictLabel}}</el-tag>
+            <el-tag prop="visitStatus" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag><br/>
             <el-button  v-hasPermi="['crm:customer:addVisitStatus']"  type="text" size="mini" @click="handleVisitStatus(scope.row)">修改</el-button>
           </template>
       </el-table-column>
@@ -191,7 +192,7 @@
           <el-button  v-hasPermi="['crm:customer:addTag']"  type="text" size="mini" @click="handleAddTag(scope.row)">打标签</el-button>
         </template>
       </el-table-column>
-      <el-table-column  label="备注" width="120px"  align="center" prop="remark"   >
+      <el-table-column  label="备注" width="150px"  align="center" prop="remark"   >
         <template slot-scope="scope">
           {{scope.row.remark}}
           <el-button   v-hasPermi="['crm:customer:addRemark']" type="text" size="mini" @click="handleAddRemark(scope.row)">修改备注</el-button>
@@ -307,6 +308,9 @@ export default {
           title:"打标签"
       },
       tagIds:[],
+      statusArr:[],
+      ctsTypeArr:[],
+      sourceArr:[],
       tagsOptions:[],
       customer:{
           open:false,
@@ -590,6 +594,27 @@ export default {
     /** 查询客户列表 */
     getList() {
       this.loading = true;
+      if(this.statusArr.length>0){
+        this.queryParams.status=this.statusArr.toString();
+      }
+      else{
+        this.queryParams.status=null
+      }
+
+      if(this.ctsTypeArr.length>0){
+        this.queryParams.customerType=this.ctsTypeArr.toString();
+      }
+      else{
+        this.queryParams.customerType=null
+      }
+
+      if(this.sourceArr.length>0){
+        this.queryParams.source=this.sourceArr.toString();
+      }
+      else{
+        this.queryParams.source=null
+      }
+
       if(this.tagIds.length>0){
         this.queryParams.tags=this.tagIds.toString();
       }