diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue index ca8414f..bc6b4a7 100644 --- a/src/components/LangSelect/index.vue +++ b/src/components/LangSelect/index.vue @@ -28,7 +28,7 @@ export default { handleSetLanguage(value) { this.$i18n.locale = value this.$store.dispatch('app/setLanguage', value) - window.location.reload(); + // window.location.reload(); // this.$message({ message: '设置语言成功', type: 'success' }) // changeLanguage(value).then(response => { // window.location.reload(); diff --git a/src/views/business/comps/select/SelectDeptUser.vue b/src/views/business/comps/select/SelectDeptUser.vue index 0b9e28e..e13e8d6 100644 --- a/src/views/business/comps/select/SelectDeptUser.vue +++ b/src/views/business/comps/select/SelectDeptUser.vue @@ -2,7 +2,8 @@ @@ -21,6 +22,10 @@ export default { type: String, default: '' }, + nameEn: { + type: String, + default: '' + }, readOnly: { type: Boolean, default: false @@ -41,12 +46,21 @@ export default { } } }, + nameEn: { + immediate: true, + handler(v) { + if(v&&v!=undefined&&v!=''){ + this.selected.nameEn=v + } + } + }, }, data() { return { selected:{ id:'', - name:'' + name:'', + nameEn:'', }, }; }, @@ -55,11 +69,12 @@ export default { methods: { showSelectDeptUser(){ if(!this.readOnly){ - this.$refs.selectDeptUserDialog.show(this.selected.id,this.selected.name) + this.$refs.selectDeptUserDialog.show(this.selected.id,this.selected.name,this.selected.nameEn) } }, handleChange(obj) { this.selected.name=obj.name + this.selected.nameEn=obj.nameEn this.$emit('change', obj) this.$emit('input', obj.id) }, diff --git a/src/views/business/comps/select/SelectDeptUserDialog.vue b/src/views/business/comps/select/SelectDeptUserDialog.vue index 5107423..57c5cc9 100644 --- a/src/views/business/comps/select/SelectDeptUserDialog.vue +++ b/src/views/business/comps/select/SelectDeptUserDialog.vue @@ -21,8 +21,8 @@ node-key="id" > - {{ data.name }} - {{ data.name }} + {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }} + {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }} @@ -30,7 +30,7 @@
已选
-
{{selected.name}}
+
{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}
@@ -63,7 +63,8 @@ export default { selected:{ id:'', - name:'' + name:'', + nameEn:'' }, listData: [], @@ -78,17 +79,18 @@ export default { mounted() { }, methods: { - show(id,name){ + show(id,name,nameEn){ this.getList() this.selected.id = id ?((id+'').indexOf('u_')>-1? id:('u_'+id)):'' this.selected.name=name || '' + this.selected.nameEn=nameEn || '' this.open = true this.filterText = '' }, filterNode(value, data) { if (!value) return true; - return data.name.indexOf(value) !== -1; + return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1); }, getList() { this.listData = [] @@ -102,7 +104,8 @@ export default { if(data && data.type===7){ this.selected = { id:data.id, - name:data.name + name:data.name, + nameEn:data.nameEn, } } }, @@ -117,7 +120,8 @@ export default { save(){ let obj = { id:this.selected && this.selected.id?this.selected.id.replace('u_',''):'', - name:this.selected.name + name:this.selected.name, + nameEn:this.selected.nameEn, } this.$emit('change', obj) this.$emit('input', obj.id) @@ -126,7 +130,8 @@ export default { delSelected(){ this.selected = { id:'', - name:'' + name:'', + nameEn:'', } } } diff --git a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue index ecfe866..1f9ab75 100644 --- a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue +++ b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue @@ -21,9 +21,9 @@ node-key="id" > - {{ data.name }} + {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }} - {{ data.name }} + {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }} @@ -31,7 +31,7 @@
已选
-
{{item.name}}
+
{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}
@@ -87,7 +87,8 @@ export default { this.selectedIds.push(id) this.selected.push({ id : id, - name:item.name + name:item.name, + nameEn:item.nameEn, }) }) this.open = true @@ -98,7 +99,7 @@ export default { }, filterNode(value, data) { if (!value) return true; - return data.name.indexOf(value) !== -1; + return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1); }, getList() { this.listData = [] @@ -119,7 +120,7 @@ export default { this.selected.splice(index,1) this.selectedIds.splice(index,1) }else{ - this.selected.push({id:data.id,name:data.name}) + this.selected.push({id:data.id,name:data.name,nameEn:data.nameEn}) this.selectedIds.push(data.id) } // this.$refs['checkbox'+data.id].$el.querySelector('input').checked = !isSelect @@ -138,7 +139,8 @@ export default { for(let i=0;i - + @@ -51,6 +51,7 @@ const EmptyDialogData = { sn:'', leader:'', leaderName:'', + leaderNameEn:'', reamrk:'', } export default { @@ -91,11 +92,12 @@ export default { changeLeader(val){ this.infoDialog.formData.leader = val.id this.infoDialog.formData.leaderName = val.name + this.infoDialog.formData.leaderNameEn = val.nameEn this.$refs.infoDialogForm.clearValidate('leader') }, edit(row) { this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields() - this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName}) + this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName,leaderNameEn:this.$store.getters.name}) this.oldStatus = 1 if(row && row.id){ this.$modal.loading() diff --git a/src/views/business/form/drug/list.vue b/src/views/business/form/drug/list.vue index a642393..e7fb33d 100644 --- a/src/views/business/form/drug/list.vue +++ b/src/views/business/form/drug/list.vue @@ -74,7 +74,7 @@ - + diff --git a/src/views/business/form/nonTrial/comp/edit.vue b/src/views/business/form/nonTrial/comp/edit.vue index 22273cc..4939b91 100644 --- a/src/views/business/form/nonTrial/comp/edit.vue +++ b/src/views/business/form/nonTrial/comp/edit.vue @@ -26,7 +26,7 @@ - + @@ -51,6 +51,7 @@ const EmptyDialogData = { sn:'', leader:'', leaderName:'', + leaderNameEn:'', reamrk:'', } export default { @@ -91,11 +92,12 @@ export default { changeLeader(val){ this.infoDialog.formData.leader = val.id this.infoDialog.formData.leaderName = val.name + this.infoDialog.formData.leaderNameEn = val.nameEn this.$refs.infoDialogForm.clearValidate('leader') }, edit(row) { this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields() - this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName}) + this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName,leaderNameEn:this.$store.getters.name}) this.oldStatus = 1 if(row && row.id){ this.$modal.loading() diff --git a/src/views/business/form/nonTrial/list.vue b/src/views/business/form/nonTrial/list.vue index ca31ff4..10998db 100644 --- a/src/views/business/form/nonTrial/list.vue +++ b/src/views/business/form/nonTrial/list.vue @@ -74,7 +74,7 @@ - + diff --git a/src/views/business/study/comp/edit.vue b/src/views/business/study/comp/edit.vue index 7fe68c2..1234ecd 100644 --- a/src/views/business/study/comp/edit.vue +++ b/src/views/business/study/comp/edit.vue @@ -26,7 +26,7 @@ - + @@ -51,6 +51,7 @@ const EmptyDialogData = { sn:'', leader:'', leaderName:'', + leaderNameEn:'', reamrk:'', } export default { @@ -91,11 +92,12 @@ export default { changeLeader(val){ this.infoDialog.formData.leader = val.id this.infoDialog.formData.leaderName = val.name + this.infoDialog.formData.leaderNameEn = val.nameEn this.$refs.infoDialogForm.clearValidate('leader') }, edit(row) { this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields() - this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName}) + this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName,leaderNameEn:this.$store.getters.name}) this.oldStatus = 1 if(row && row.id){ this.$modal.loading() diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue index f62607c..142263b 100644 --- a/src/views/business/study/comp/suject.vue +++ b/src/views/business/study/comp/suject.vue @@ -15,7 +15,7 @@
-
{{item.deptName}}({{item.leaderName}})
+
{{item.deptName}}({{$i18n.locale === 'zh_CN'?item.leaderName:item.leaderNameEn}})
{{$t('page.business.study.studyEnter.yq')}}
@@ -34,7 +34,8 @@