合并分支 'master_dev' 到 'master'

Master dev



查看合并请求 !27

@@ -20,7 +20,7 @@ export const selectByliscenNo = params => { return axios.get(`${baseServiceURL}/
 //出任务
 //出任务
 export const insertSelective = params => { return http.post(`${baseServiceURL}/map/location/insertSelective`, params); };
 export const insertSelective = params => { return http.post(`${baseServiceURL}/map/location/insertSelective`, params); };
 //获取用户列表
 //获取用户列表
-export const getUserList = params => { return http.post(`${serviceName}/crm/list`,  params) };
+export const getUserList = (data,params) => { return http.post(`${serviceName}/crm/list`, data, params) };
 
 
 //车辆轨迹
 //车辆轨迹
 export const historyTrack = params => { return axios.get(`${baseServiceURL}/map/location/historyTrack`, { params: params }); };
 export const historyTrack = params => { return axios.get(`${baseServiceURL}/map/location/historyTrack`, { params: params }); };

@@ -736,9 +736,10 @@
             },
             },
             //获取用户名列表
             //获取用户名列表
             getUsers() {
             getUsers() {
-                let para = {orgtype: "", pageSize: 1000, pageNum: 1};
+                let data = {orgtype: "",roleName:"",departmentid:""};
+                let para={pageSize: 1000, pageNum: 1}
                 this.listLoading = true;
                 this.listLoading = true;
-                getUserList(para).then((res) => {
+                getUserList(data,para).then((res) => {
                     this.usernames = res.data.data.list;
                     this.usernames = res.data.data.list;
                 }).catch((error) => {
                 }).catch((error) => {
                     this.$message.error(error.toString());
                     this.$message.error(error.toString());