|
|
@@ -241,7 +241,7 @@
|
|
|
<el-option
|
|
|
v-for="item in userOption"
|
|
|
:key="item.staffid"
|
|
|
- :label="item.name +' '+ item.deptName"
|
|
|
+ :label="item.nickName +' '+ item.dept.deptName"
|
|
|
:value="item.staffid"
|
|
|
:disabled="item.disabled">
|
|
|
</el-option>
|
|
|
@@ -273,7 +273,7 @@
|
|
|
<el-option
|
|
|
v-for="item in userOption"
|
|
|
:key="item.staffid"
|
|
|
- :label="item.name +' '+ item.deptName"
|
|
|
+ :label="item.nickName +' '+ item.dept.deptName"
|
|
|
:value="item.staffid"
|
|
|
:disabled="item.disabled">
|
|
|
</el-option>
|
|
|
@@ -442,6 +442,7 @@ import {listStaff} from "@/api/training/newstaff/tnNew";
|
|
|
import {allFileList, delCommonfile} from "@/api/common/commonfile";
|
|
|
import { Loading } from 'element-ui';
|
|
|
import {date} from "mockjs/src/mock/random/date";
|
|
|
+import {listUserNoPage} from "@/api/system/user";
|
|
|
|
|
|
export default {
|
|
|
name: "Tsnew",
|
|
|
@@ -604,7 +605,7 @@ export default {
|
|
|
this.getDicts("training_newstaff_type").then(response => {
|
|
|
this.planTypeOptions = response.data;
|
|
|
});
|
|
|
- listStaff(this.queryParams).then(response => {
|
|
|
+ listUserNoPage({}).then(response => {
|
|
|
this.userOption = response.data;
|
|
|
});
|
|
|
},
|
