diff --git a/src/views/user/AddUser.vue b/src/views/user/AddUser.vue
index c3da6a5..e2d2bf3 100644
--- a/src/views/user/AddUser.vue
+++ b/src/views/user/AddUser.vue
@@ -36,52 +36,56 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
@@ -121,19 +126,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -231,39 +237,42 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -274,36 +283,38 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -457,7 +468,7 @@ export default {
userId: this.$store.state.userId,
userName: '', //用户姓名
uniqueIdentification: '', //唯一识别码
- documentType: 1, //证件类型
+ documentType: '居民身份证', //证件类型
idNumber: '', //证件号码
cityId: '', //省份
countries: '中国', //国家
@@ -622,12 +633,14 @@ export default {
getdata() {
this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => {
let userInfo = res.result.hrUserInfo
- let schoolId = userInfo.schoolId
- this.form = Object.assign(userInfo,res.result.userAccountList[0])
- this.form.schoolId = schoolId
- this.form.accountId = userInfo.id
- this.originAccount = this.form.account
+ this.form.accountId = userInfo.userId
+ this.originAccount = res.result.userAccountList[0].account
this.archivesList = res.result.personalFileList
+ this.form.documentType = '居民身份证'
+ this.form.countries = res.result.hrUserInfo.countries
+ this.form.cityName = res.result.hrUserInfo.cityName
+ this.form.schoolName = res.result.hrUserInfo.schoolName
+ this.form.provinceName = res.result.hrUserInfo.provinceName
this.$nextTick(() => {
if(this.form.provinceId){
@@ -636,30 +649,31 @@ export default {
if(this.archivesList.length){
this.archivesList.forEach((e,k) =>{
this.$set(e, 'subjectList', this.subjectList);
- this.$set(e, 'disciplineId', e.disciplineId ? e.disciplineId : '');
+ this.$set(e, 'disciplineId', e.disciplineName ? e.disciplineName : '');
this.$set(e, 'disciplineName', e.disciplineName ? e.disciplineName : '');
- this.$set(e, 'professionalClassId', e.professionalClassId ? e.professionalClassId : '');
+ this.$set(e, 'professionalClassId', e.professionalClassName ? e.professionalClassName : '');
this.$set(e, 'professionalClassName', e.professionalClassName ? e.professionalClassName : '');
- this.$set(e, 'professionalId', e.professionalId ? e.professionalId : '');
+ this.$set(e, 'professionalId', e.professionalName ? e.professionalName : '');
this.$set(e, 'professionalName', e.professionalName ? e.professionalName : '');
- this.$set(e, 'schoolId', e.schoolId ? e.schoolId : '');
+ this.$set(e, 'schoolId', e.schoolName ? e.schoolName : '');
this.$set(e, 'schoolName', e.schoolName ? e.schoolName : '');
- if(e.disciplineId){
- this.$get(this.api.queryCourseProfessionalClass, { disciplineId: e.disciplineId }).then(res => {
- this.$set(e, 'ProfessionalClassList', res.list);
- }).catch(res => {});
- }else{
- this.$set(e, 'ProfessionalClassList', []);
- }
- if(e.professionalClassId){
- this.$get(this.api.queryCourseProfessional,{ professionalClassId: e.professionalClassId }).then(res => {
- this.$set(e, 'ProfessionalList', res.list);
- }).catch(res => {});
- }else{
- this.$set(e, 'ProfessionalList', []);
- }
+ // if(e.disciplineId){
+ // this.$get(this.api.queryCourseProfessionalClass, { disciplineId: e.disciplineId }).then(res => {
+ // this.$set(e, 'ProfessionalClassList', res.list);
+ // }).catch(res => {});
+ // }else{
+ // this.$set(e, 'ProfessionalClassList', []);
+ // }
+ // if(e.professionalClassId){
+ // this.$get(this.api.queryCourseProfessional,{ professionalClassId: e.professionalClassId }).then(res => {
+ // this.$set(e, 'ProfessionalList', res.list);
+ // }).catch(res => {});
+ // }else{
+ // this.$set(e, 'ProfessionalList', []);
+ // }
})
+
}else{
// this.concatArch(1)
}