|
@@ -90,7 +90,7 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
- <el-form-item label="岗位:" prop="postName">
|
|
|
|
|
|
|
+ <el-form-item label="岗位:" prop="postId">
|
|
|
<!-- <el-input
|
|
<!-- <el-input
|
|
|
clearable
|
|
clearable
|
|
|
:maxlength="100"
|
|
:maxlength="100"
|
|
@@ -101,7 +101,7 @@
|
|
|
dictName="岗位"
|
|
dictName="岗位"
|
|
|
clearable
|
|
clearable
|
|
|
filterable
|
|
filterable
|
|
|
- v-model="form.postName"
|
|
|
|
|
|
|
+ v-model="form.postId"
|
|
|
>
|
|
>
|
|
|
</DictSelection>
|
|
</DictSelection>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -1089,10 +1089,13 @@
|
|
|
import { getFactoryarea, getProfessionPageList } from '@/api/factoryModel';
|
|
import { getFactoryarea, getProfessionPageList } from '@/api/factoryModel';
|
|
|
import WithView from '@/components/upload/WithView.vue';
|
|
import WithView from '@/components/upload/WithView.vue';
|
|
|
import FileUpload from '@/components/upload/fileUpload.vue';
|
|
import FileUpload from '@/components/upload/fileUpload.vue';
|
|
|
|
|
+ import dictMixins from '@/mixins/dictMixins';
|
|
|
|
|
|
|
|
// D:\中赢\kd-aiot-frontend\src\views\system\user
|
|
// D:\中赢\kd-aiot-frontend\src\views\system\user
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
|
|
+ mixins: [dictMixins],
|
|
|
|
|
+
|
|
|
components: { OrgSelect, RoleSelect, RegionsSelect, WithView, FileUpload },
|
|
components: { OrgSelect, RoleSelect, RegionsSelect, WithView, FileUpload },
|
|
|
props: {
|
|
props: {
|
|
|
// 弹窗是否打开
|
|
// 弹窗是否打开
|
|
@@ -1130,7 +1133,8 @@
|
|
|
idCard: '',
|
|
idCard: '',
|
|
|
workTypeId: '',
|
|
workTypeId: '',
|
|
|
birthday: '',
|
|
birthday: '',
|
|
|
- signature: {}
|
|
|
|
|
|
|
+ signature: {},
|
|
|
|
|
+ postName:''
|
|
|
};
|
|
};
|
|
|
return {
|
|
return {
|
|
|
defaultForm,
|
|
defaultForm,
|
|
@@ -1768,7 +1772,7 @@
|
|
|
addIdentityPhotos() {
|
|
addIdentityPhotos() {
|
|
|
this.form.identityPhotos.push({
|
|
this.form.identityPhotos.push({
|
|
|
holder: this.form.name,
|
|
holder: this.form.name,
|
|
|
- holderType:'1'
|
|
|
|
|
|
|
+ holderType: '1'
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
handleIdentityPhotosDel(row, index) {
|
|
handleIdentityPhotosDel(row, index) {
|
|
@@ -1840,6 +1844,9 @@
|
|
|
// this.form['deptTree'] = JSON.stringify(this.deptTree)
|
|
// this.form['deptTree'] = JSON.stringify(this.deptTree)
|
|
|
// }
|
|
// }
|
|
|
|
|
|
|
|
|
|
+ if (this.form.postId) {
|
|
|
|
|
+ this.form.postName = this.getDictValue('岗位', this.form.postId);
|
|
|
|
|
+ }
|
|
|
const data = {
|
|
const data = {
|
|
|
...this.form
|
|
...this.form
|
|
|
};
|
|
};
|