diff --git a/public/favicon.ico b/public/favicon.ico index 2cd3d66..5a70270 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/lang/en/business/resource/gyzj.js b/src/lang/en/business/resource/gyzj.js index 35b425d..a06a9e6 100644 --- a/src/lang/en/business/resource/gyzj.js +++ b/src/lang/en/business/resource/gyzj.js @@ -24,7 +24,7 @@ export default { kgy1:'Warehouse Keeper', kgy2:'Warehouse Keeper 2', - plff:'批量发放', + plff:'Batch Distribution', plczyj:'Batch Dispose Substance', plczrq:'Batch Dispose Containers', plsd:'Batch Lock', @@ -36,7 +36,7 @@ export default { jiedang:'De-archive', jieyue:'Check-out', guihuan:'Return', - fafang:'发放', + fafang:'Distribution', ysff:'Issue Key', czrq:'Dispose Container', czyj:'Dispose Substance', diff --git a/src/lang/en/business/resource/mjy.js b/src/lang/en/business/resource/mjy.js index 5a1910a..e3ba6e0 100644 --- a/src/lang/en/business/resource/mjy.js +++ b/src/lang/en/business/resource/mjy.js @@ -23,7 +23,7 @@ export default { kgy1:'Warehouse Keeper', kgy2:'Warehouse Keeper 2', - plff:'批量发放', + plff:'Batch Distribution', plczyj:'Batch Dispose Substance', plczrq:'Batch Dispose Containers', plsd:'Batch Lock', @@ -35,7 +35,7 @@ export default { jiedang:'De-archive', jieyue:'Check-out', guihuan:'Return', - fafang:'发放', + fafang:'Distribution', ysff:'Issue Key', czrq:'Dispose Container', czyj:'Dispose Substance', diff --git a/src/lang/en/business/resource/zcg.js b/src/lang/en/business/resource/zcg.js index 9e83b40..4067f53 100644 --- a/src/lang/en/business/resource/zcg.js +++ b/src/lang/en/business/resource/zcg.js @@ -1,12 +1,12 @@ export default { - ysbh: '钥匙编号', + ysbh: 'ID', jyr: '借用人', zt: 'Status', jyz: 'In Use', wjy: 'Not in Use', - plgh: '批量归还', + plgh: 'Batch Return', zcg: 'Locker', - ysbh: '钥匙编号', + ysbh: 'ID', ys1jyr: 'Key 1 User', ys2jyr: 'Key 2 User', glyj: 'Contained Substance', @@ -20,13 +20,13 @@ export default { ghr2mm:'钥匙2归还人密码', jsr:'接收人', jsrmm:'接收人密码', - qmyy:'签名意义', + qmyy:'Purpose', remark:'Remark', lqr1Id:'Key 1 User', lqr1mm:'Key 1 User Password', lqr2Id:'Key 2 User', lqr2mm:'Key 2 User Password', - ffr:'发放人', - ffrmm:'发放人密码', + ffr:'Distribute User', + ffrmm:'Distribute User Password', } \ No newline at end of file diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js index 9f29105..3997c09 100644 --- a/src/lang/en/business/study/studyFormFill.js +++ b/src/lang/en/business/study/studyFormFill.js @@ -1,4 +1,12 @@ export default { + mc:'Name', + bh:'Id', + syl:'Usage Amount', + cz:'Dispose', + tjcz:'Add Dispose', + cc:'Storage', + tjcc:'Add Storage', + yltj:'用量统计', jcsz:'Setup', bdtb:'Form filling', xzbd:'Create', @@ -33,7 +41,7 @@ export default { dcxgjcgj:'导出(修改稽查轨迹)', dcbhsjgj:'导出(不含数据轨迹)', -ytbd:'预填表单', + ytbd:'Preset', tbz:'On-going', ytj:'Submitted', ywc:'Completed', diff --git a/src/lang/zh/business/resource/zcg.js b/src/lang/zh/business/resource/zcg.js index 1cf5f28..120ae8c 100644 --- a/src/lang/zh/business/resource/zcg.js +++ b/src/lang/zh/business/resource/zcg.js @@ -10,7 +10,7 @@ export default { ys1jyr: '钥匙1借用人', ys2jyr: '钥匙2借用人', glyj: '关联药剂', - ysff: '钥匙发放', + ysff: '发放钥匙', gh: '归还', ysgh: '钥匙归还', ysghts:'请确认是否归还以下钥匙', diff --git a/src/utils/menu.js b/src/utils/menu.js index 3cadc63..b9efe22 100644 --- a/src/utils/menu.js +++ b/src/utils/menu.js @@ -40,5 +40,8 @@ export function getMenuName(menuName) { if (!this.$i18n.locale || this.$i18n.locale === 'zh_CN') { return menuName } - return menuObj[menuName] + if (menuName.indexOf(':') > -1) { + return menuObj[menuName.split(':')[0]] + menuName.split(':')[1] + } + return menuObj[menuName] || menuName } diff --git a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue index 1f9ab75..7ee111f 100644 --- a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue +++ b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue @@ -144,6 +144,8 @@ export default { }) } this.$emit('change', backList) + }, + close(){ this.open = false }, delSelected(row){ diff --git a/src/views/business/form/drug/comp/enter.vue b/src/views/business/form/drug/comp/enter.vue index 1659fcc..3ba9f4b 100644 --- a/src/views/business/form/drug/comp/enter.vue +++ b/src/views/business/form/drug/comp/enter.vue @@ -52,7 +52,7 @@ export default { this.$modal.loading() drug_info({id:this.$route.params.studyId}).then(({data}) => { this.study = data - const obj = Object.assign({}, this.$route, { title: '麻精药：'+this.study.sn }) + const obj = Object.assign({}, this.$route, { title: '麻精药表单:'+this.study.sn }) this.$tab.updatePage(obj); }).finally(() => { this.$modal.closeLoading() diff --git a/src/views/business/form/drug/list.vue b/src/views/business/form/drug/list.vue index e7fb33d..7cd84ad 100644 --- a/src/views/business/form/drug/list.vue +++ b/src/views/business/form/drug/list.vue @@ -237,7 +237,7 @@ export default { this.getList() }, enter(row){ - this.$tab.openPage("进入", '/drug/enter/' + row.id) + this.$tab.openPage(" ", '/drug/enter/' + row.id) // this.showType = 'enter' // this.$refs.enter.show(row) }, diff --git a/src/views/business/form/nonTrial/comp/enter.vue b/src/views/business/form/nonTrial/comp/enter.vue index dcfbf1b..d164958 100644 --- a/src/views/business/form/nonTrial/comp/enter.vue +++ b/src/views/business/form/nonTrial/comp/enter.vue @@ -50,7 +50,7 @@ export default { this.$modal.loading() nonTrial_info({id:this.$route.params.studyId}).then(({data}) => { this.study = data - const obj = Object.assign({}, this.$route, { title: '非试验：'+this.study.sn }) + const obj = Object.assign({}, this.$route, { title: '非试验表单:'+this.study.sn }) this.$tab.updatePage(obj); }).finally(() => { this.$modal.closeLoading() diff --git a/src/views/business/form/nonTrial/list.vue b/src/views/business/form/nonTrial/list.vue index 10998db..0b79e90 100644 --- a/src/views/business/form/nonTrial/list.vue +++ b/src/views/business/form/nonTrial/list.vue @@ -237,7 +237,7 @@ export default { this.getList() }, enter(row){ - this.$tab.openPage("进入", '/nonTrial/enter/' + row.id) + this.$tab.openPage(" ", '/nonTrial/enter/' + row.id) // this.showType = 'enter' // this.$refs.enter.show(row) }, diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue index 15d3928..6a3102e 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue @@ -1,7 +1,7 @@