作者 朱兆平

bug-fix:

1. 修复车辆分配组织机构BUG
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 <el-option 307 <el-option
308 v-for="item in usernames" 308 v-for="item in usernames"
309 :key="item.departmentid" 309 :key="item.departmentid"
310 - :label="item.departmentid" 310 + :label="item.roleName"
311 :value="item.departmentid" 311 :value="item.departmentid"
312 :disabled="item.disabled"> 312 :disabled="item.disabled">
313 </el-option> 313 </el-option>
@@ -339,6 +339,7 @@ @@ -339,6 +339,7 @@
339 import {isAdmin, loginedUserInfo} from "../../api/user"; 339 import {isAdmin, loginedUserInfo} from "../../api/user";
340 //获取关锁列表 340 //获取关锁列表
341 // import {list as lockList} from "../../api/lock_info/lock_info"; 341 // import {list as lockList} from "../../api/lock_info/lock_info";
  342 + import { getList as getCRMList } from '@/api/crm_api';
342 import { getUserList } from '../../api/user'; 343 import { getUserList } from '../../api/user';
343 import {selectVehicle, insertSelective, selectHistroy} from '../../api/consigner/vehicle'; 344 import {selectVehicle, insertSelective, selectHistroy} from '../../api/consigner/vehicle';
344 345
@@ -514,9 +515,8 @@ @@ -514,9 +515,8 @@
514 }, 515 },
515 //获取用户名 516 //获取用户名
516 getUsers:function() { 517 getUsers:function() {
517 - let para = {pageSize:1,pageNum:10000};  
518 this.listLoading = true; 518 this.listLoading = true;
519 - getUserList(para).then((res) => { 519 + getCRMList({"roleName":"","orgtype":"","departmentid":""},1,10000).then((res) => {
520 this.usernames = res.data.data.list; 520 this.usernames = res.data.data.list;
521 }).catch((error) => { 521 }).catch((error) => {
522 this.$message.error(error.toString()); 522 this.$message.error(error.toString());