|
@@ -240,9 +240,9 @@
|
|
|
<el-select v-model="form.staffId" filterable :placeholder="$t('请选择')+$t('培训员工')" :disabled="isEdit">
|
|
|
<el-option
|
|
|
v-for="item in userOption"
|
|
|
- :key="item.staffId"
|
|
|
- :label="item.nickName +' '+ item.dept.deptName"
|
|
|
- :value="item.staffId"
|
|
|
+ :key="item.staffid"
|
|
|
+ :label="item.name +' '+ item.deptName"
|
|
|
+ :value="item.staffid"
|
|
|
:disabled="item.disabled">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -273,9 +273,9 @@
|
|
|
<el-select v-model="form.mentorStaffId" filterable :placeholder="$t('请选择')+$t('导师员工')">
|
|
|
<el-option
|
|
|
v-for="item in userOption"
|
|
|
- :key="item.staffId"
|
|
|
- :label="item.nickName +' '+ item.dept.deptName"
|
|
|
- :value="item.staffId"
|
|
|
+ :key="item.staffid"
|
|
|
+ :label="item.name +' '+ item.deptName"
|
|
|
+ :value="item.staffid"
|
|
|
:disabled="item.disabled">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
@@ -444,6 +444,7 @@ 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";
|
|
|
+import {listStaffmgrByDeptAndTeam} from "@/api/plant/staffmgr";
|
|
|
|
|
|
export default {
|
|
|
name: "Tsnew",
|
|
@@ -606,8 +607,8 @@ export default {
|
|
|
this.getDicts("training_newstaff_type").then(response => {
|
|
|
this.planTypeOptions = response.data;
|
|
|
});
|
|
|
- listUserNoPage({}).then(response => {
|
|
|
- this.userOption = response.data;
|
|
|
+ listStaffmgrByDeptAndTeam({unit:103}).then(response => {
|
|
|
+ this.userOption = response.rows;
|
|
|
});
|
|
|
},
|
|
|
methods: {
|