diff --git a/src/api/admin.js b/src/api/admin.js index 361ec37..7a525e8 100644 --- a/src/api/admin.js +++ b/src/api/admin.js @@ -29,11 +29,12 @@ export function getInstitutionList(typeId) { }) } -export function addUser(param) { +export function addUser(param, confirm = false) { return request({ url: `/user/addUser`, method: 'post', - data: param + data: param, + confirm }) } diff --git a/src/utils/request.js b/src/utils/request.js index c6b742f..9e9c433 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,7 +18,7 @@ service.interceptors.request.use( path = router && router.app && router.app._route && router.app._route.path config.headers['Content-Type'] = 'application/json;charset=UTF-8' var language = zzSessionStorage.getItem('lang') - config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9' + config.headers['Accept-Language'] = language === 'en' ? 'en-US,en;q=0.5' : 'zh-CN,zh;q=0.9' if (store.getters.token) { config.headers.Authorization = `Bearer ${store.getters.token}` } @@ -30,7 +30,7 @@ service.interceptors.request.use( if (store.state.user.userId !== zzSessionStorage.getItem('userId')) { window.location.href = `/login` zzSessionStorage.removeItem('lastWorkbench') - Alert(store.state.lang.language === 'en'? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', { + Alert(store.state.lang.language === 'en' ? 'The same browser only allows one user account to be logged in at a time.' : '同一浏览器只允许同时登陆一个账户', { type: 'warning', }) } @@ -55,11 +55,11 @@ service.interceptors.response.use( isConfirm = true return Promise.resolve(res) } else if (res.IsSuccess === false) { - if (res.Code !== 5) { - MessageBox.confirm(res.ErrorMessage, { + if (res.Code !== 5 && !response.config.confirm) { + MessageBox.confirm(res.ErrorMessage, { type: 'warning', showCancelButton: false, - callback: action => {} + callback: action => { } }) } return Promise.reject(res) @@ -80,24 +80,24 @@ service.interceptors.response.use( }) } switch (status) { - case 400: message = store.state.lang.language === 'en'? 'Request error' : '请求错误'; break - case 401: message = store.state.lang.language === 'en'? 'Not authorized or login timed out. Please log in again.' : '未授权或登陆超时,请重新登录'; break + case 400: message = store.state.lang.language === 'en' ? 'Request error' : '请求错误'; break + case 401: message = store.state.lang.language === 'en' ? 'Not authorized or login timed out. Please log in again.' : '未授权或登陆超时,请重新登录'; break case 403: message = error.response.data.ErrorMessage; break - case 404: message = store.state.lang.language === 'en'? 'Request address error' : `请求地址出错`; break - case 405: message = store.state.lang.language === 'en'? 'Interface parameter error or request method inconsistency' : `接口参数传递错误,或者请求方法不一致`; break - case 408: message = store.state.lang.language === 'en'? 'Request timed out' : '请求超时'; break - case 429: message = store.state.lang.language === 'en'? 'The application service limits the traffic. Your requests are too frequent. Please try again later.' : '应用服务限流,您的请求过于频繁,请稍后再试'; break - case 500: message = store.state.lang.language === 'en'? 'Internal server error, and unable to complete the request. Software release might be in process. Please contact the administrator.' : '服务器内部错误,无法完成请求;可能正在发布中,请联系管理员处理'; break - case 501: message = store.state.lang.language === 'en'? 'Service has not been implemented.' : '服务未实现'; break - case 502: message = store.state.lang.language === 'en'? 'System is being upgraded. Please wait patiently.' : '系统正在升级,请耐心等待。'; break - case 503: message = store.state.lang.language === 'en'? 'Service is not available' : '服务不可用'; break - case 504: message = store.state.lang.language === 'en'? 'Gateway timed out' : '网关超时'; break - case 505: message = store.state.lang.language === 'en'? 'HTTP version is not supported' : 'HTTP版本不受支持'; break + case 404: message = store.state.lang.language === 'en' ? 'Request address error' : `请求地址出错`; break + case 405: message = store.state.lang.language === 'en' ? 'Interface parameter error or request method inconsistency' : `接口参数传递错误,或者请求方法不一致`; break + case 408: message = store.state.lang.language === 'en' ? 'Request timed out' : '请求超时'; break + case 429: message = store.state.lang.language === 'en' ? 'The application service limits the traffic. Your requests are too frequent. Please try again later.' : '应用服务限流,您的请求过于频繁,请稍后再试'; break + case 500: message = store.state.lang.language === 'en' ? 'Internal server error, and unable to complete the request. Software release might be in process. Please contact the administrator.' : '服务器内部错误,无法完成请求;可能正在发布中,请联系管理员处理'; break + case 501: message = store.state.lang.language === 'en' ? 'Service has not been implemented.' : '服务未实现'; break + case 502: message = store.state.lang.language === 'en' ? 'System is being upgraded. Please wait patiently.' : '系统正在升级,请耐心等待。'; break + case 503: message = store.state.lang.language === 'en' ? 'Service is not available' : '服务不可用'; break + case 504: message = store.state.lang.language === 'en' ? 'Gateway timed out' : '网关超时'; break + case 505: message = store.state.lang.language === 'en' ? 'HTTP version is not supported' : 'HTTP版本不受支持'; break default: break } if (error.response.status === 401) { if (store.getters.token) { - if(message !== ''){ + if (message !== '') { Message({ message: message, type: 'warning', @@ -112,26 +112,26 @@ service.interceptors.response.use( }) } else { Message({ - message: store.state.lang.language === 'en'? 'You are not authorized to access the interface' : '您无权访问接口', + message: store.state.lang.language === 'en' ? 'You are not authorized to access the interface' : '您无权访问接口', type: 'warning', showClose: true }) } } else { - if(message !== '' && isConfirm){ - MessageBox.confirm(message, store.state.lang.language === 'en'? 'Warning' : '警告', { + if (message !== '' && isConfirm) { + MessageBox.confirm(message, store.state.lang.language === 'en' ? 'Warning' : '警告', { type: 'warning', showCancelButton: false, - callback: action => {} + callback: action => { } }) } } } if (!window.navigator.onLine && isConfirm) { - MessageBox.confirm(store.state.lang.language === 'en'? 'Please check your network,and try again later!' : '请检查网络,稍后重试!', store.state.lang.language === 'en'? 'Warning' : '警告', { + MessageBox.confirm(store.state.lang.language === 'en' ? 'Please check your network,and try again later!' : '请检查网络,稍后重试!', store.state.lang.language === 'en' ? 'Warning' : '警告', { type: 'warning', showCancelButton: false, - callback: action => {} + callback: action => { } }) isConfirm = false } diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue index ddce450..73d73ea 100644 --- a/src/views/system/user/components/UserInfo.vue +++ b/src/views/system/user/components/UserInfo.vue @@ -80,6 +80,7 @@ style="width: 100%" :disabled="user.CanEditUserType === false" clearable + @change="userTypeChange" > @@ -291,7 +291,13 @@ export default { this.form.BaseUrl = `${location.protocol}//${location.host}/login`; this.form.RouteUrl = `${location.protocol}//${location.host}/email-recompose`; } - addUser(this.form) + const selectedUserType = this.userTypeOptions.filter( + (item) => item.Id === this.form.UserTypeId + ); + if (selectedUserType.length > 0) { + this.form.UserTypeEnum = selectedUserType[0].UserTypeEnum; + } + addUser(this.form, true) .then((res) => { this.btnLoading = false; this.$message.success( @@ -305,8 +311,8 @@ export default { // this.$set(this.form, "LastName", res.Result.LastName); // this.$set(this.form, "FirstName", res.Result.FirstName); // this.$set(this.form, "Phone", res.Result.Phone); - this.errorMsg = res.ErrorMessage; } + this.errorMsg = res.ErrorMessage; this.btnLoading = false; }); } diff --git a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue index fd7e8a2..7217076 100644 --- a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue +++ b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue @@ -117,7 +117,11 @@ :label="$t('trials:trials-myinfo:form:gender')" show-overflow-tooltip min-width="140" - > + > + + - +