Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/crm/customer/line.vue

src/views/company/companyVoiceLogs/index.vue

@@ -30,6 +30,16 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
        <el-form-item label="客户来源" prop="source">
             <el-select filterable v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
@@ -41,6 +51,16 @@
                   />
             </el-select>
           </el-form-item>
+          <el-form-item label="时长" prop="times">
+        <el-select v-model="queryParams.times" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="dict in timesOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
 
         <el-form-item label="创建时间" prop="createTime">
             <el-date-picker
@@ -156,6 +176,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      timesOptions:[],
       statusOptions:[],
       companys:[],
       // 遮罩层
@@ -213,6 +234,9 @@ export default {
     };
   },
   created() {
+    this.getDicts("company_voice_logs_times").then((response) => {
+      this.timesOptions = response.data;
+    });
     this.getDicts("company_voice_logs_status").then((response) => {
       this.statusOptions = response.data;
     });

src/views/crm/components/assignUser.vue

@@ -19,16 +19,15 @@
                     <el-table-column label="员工帐号" align="center" prop="userName" />
                     <el-table-column label="员工姓名" align="center" prop="nickName" />
                     <el-table-column label="所属部门" align="center" prop="deptName" />
-                    <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
                     <el-table-column label="今日分配数" align="center" prop="nowDayCustomerCount"   />
-                    <el-table-column label="分配数量" align="center"  prop="count" width="200px" >
+                    <el-table-column label="分配数量" align="center"  prop="count" width="150px" >
                         <template slot-scope="scope">
                         <div>
                             <el-input-number ref="stepTxtNum" :min="0" v-model="scope.row.count"  @change="changeVal(scope.row)"   size="mini"   ></el-input-number>
                         </div>
                     </template>
                     </el-table-column>
-                    <el-table-column label="操作"   align="center" fixed="right" width="120px" class-name="small-padding fixed-width">
+                    <el-table-column label="操作"   align="center" fixed="right" class-name="small-padding fixed-width">
                         <template slot-scope="scope">
                             <el-button
                             size="mini"

src/views/crm/customer/line.vue

@@ -268,7 +268,7 @@
 <script>
  import store from "@/store";
 import { importLineTemplate,getLineCustomerList ,assignToUser,getCustomerDetails,exportCustomer } from "@/api/crm/customer";
-import customerDetails from '../components/customerDetails.vue';
+import customerDetails from '../components/lineCustomerDetails.vue';
 import { treeselect } from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";