diff --git a/src/lang/en.js b/src/lang/en.js index e53b266..1022c99 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -13,21 +13,23 @@ import template from './en/system/template' // 试验管理 import study from './en/business/study/study' import studyEnter from './en/business/study/studyEnter' +import studyFormPre from './en/business/study/studyFormPre' //表单 import form from './en/business/form/form' //资源库管理 +import resource from './en/business/resource/resource' // 仪器管理 -import yq from './en/business/resource/yq/yq' +import yq from './en/business/resource/yq' // 暂存柜 -import zcg from './en/business/resource/zcg/zcg' +import zcg from './en/business/resource/zcg' // 麻精药 -import mjy from './en/business/resource/mjy/mjy' +import mjy from './en/business/resource/mjy' // 给药制剂 -import gyzj from './en/business/resource/gyzj/gyzj' +import gyzj from './en/business/resource/gyzj' // 试剂库存 -import sj from './en/business/resource/sj/sj' +import sj from './en/business/resource/sj' export default { system: { name: 'WestChina-Frontier PharmaTech ELN', @@ -110,35 +112,17 @@ export default { }, business: { resource: { - zjzt: { - rk: '入库', - yff: '已发放', - ysd: '已锁定', - dgd: '待归档', - gd: '归档', - djd: '待解档' - }, - jyzt: { - wjy: '未借阅', - djy: '待借阅', - jyz: '借阅中' - }, - jlzt: { - wsd: '未锁定', - ysd: '已锁定', - dgd: '待归档', - gd: '归档', - djd: '待解档' - }, - zcg, - mjy, - yq, - sj, - gyzj + resource:resource, + zcg:zcg, + mjy:mjy, + yq:yq, + sj:sj, + gyzj:gyzj, }, study: { study: study, - studyEnter: studyEnter + studyEnter: studyEnter, + studyFormPre:studyFormPre }, form: form } diff --git a/src/lang/en/business/resource/gyzj/gyzj.js b/src/lang/en/business/resource/gyzj.js similarity index 100% rename from src/lang/en/business/resource/gyzj/gyzj.js rename to src/lang/en/business/resource/gyzj.js diff --git a/src/lang/en/business/resource/mjy/mjy.js b/src/lang/en/business/resource/mjy.js similarity index 100% rename from src/lang/en/business/resource/mjy/mjy.js rename to src/lang/en/business/resource/mjy.js diff --git a/src/lang/en/business/resource/resource.js b/src/lang/en/business/resource/resource.js new file mode 100644 index 0000000..14d00f6 --- /dev/null +++ b/src/lang/en/business/resource/resource.js @@ -0,0 +1,22 @@ +export default { + zjzt: { + rk: '入库', + yff: '已发放', + ysd: '已锁定', + dgd: '待归档', + gd: '归档', + djd: '待解档' + }, + jyzt: { + wjy: '未借阅', + djy: '待借阅', + jyz: '借阅中' + }, + jlzt: { + wsd: '未锁定', + ysd: '已锁定', + dgd: '待归档', + gd: '归档', + djd: '待解档' + }, +} diff --git a/src/lang/en/business/resource/sj/sj.js b/src/lang/en/business/resource/sj.js similarity index 100% rename from src/lang/en/business/resource/sj/sj.js rename to src/lang/en/business/resource/sj.js diff --git a/src/lang/en/business/resource/yq/yq.js b/src/lang/en/business/resource/yq.js similarity index 100% rename from src/lang/en/business/resource/yq/yq.js rename to src/lang/en/business/resource/yq.js diff --git a/src/lang/en/business/resource/zcg/zcg.js b/src/lang/en/business/resource/zcg.js similarity index 100% rename from src/lang/en/business/resource/zcg/zcg.js rename to src/lang/en/business/resource/zcg.js diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js new file mode 100644 index 0000000..5ea6092 --- /dev/null +++ b/src/lang/en/business/study/studyFormPre.js @@ -0,0 +1,3 @@ +export default { + +} diff --git a/src/lang/zh.js b/src/lang/zh.js index 12598d4..df67de4 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -13,21 +13,23 @@ import template from './zh/system/template' // 试验管理 import study from './zh/business/study/study' import studyEnter from './zh/business/study/studyEnter' +import studyFormPre from './zh/business/study/studyFormPre' //表单 import form from './zh/business/form/form' //资源库管理 +import resource from './zh/business/resource/resource' // 仪器管理 -import yq from './zh/business/resource/yq/yq' +import yq from './zh/business/resource/yq' // 暂存柜 -import zcg from './zh/business/resource/zcg/zcg' +import zcg from './zh/business/resource/zcg' // 麻精药 -import mjy from './zh/business/resource/mjy/mjy' +import mjy from './zh/business/resource/mjy' // 给药制剂 -import gyzj from './zh/business/resource/gyzj/gyzj' +import gyzj from './zh/business/resource/gyzj' // 试剂库存 -import sj from './zh/business/resource/sj/sj' +import sj from './zh/business/resource/sj' export default { system: { name: '华西海圻ELN系统', @@ -107,35 +109,17 @@ export default { }, business: { resource: { - zjzt: { - rk: '入库', - yff: '已发放', - ysd: '已锁定', - dgd: '待归档', - gd: '归档', - djd: '待解档' - }, - jyzt: { - wjy: '未借阅', - djy: '待借阅', - jyz: '借阅中' - }, - jlzt: { - wsd: '未锁定', - ysd: '已锁定', - dgd: '待归档', - gd: '归档', - djd: '待解档' - }, - zcg, - mjy, - yq, - sj, - gyzj + resource:resource, + zcg:zcg, + mjy:mjy, + yq:yq, + sj:sj, + gyzj:gyzj, }, study: { study: study, - studyEnter: studyEnter + studyEnter: studyEnter, + studyFormPre }, form: form } diff --git a/src/lang/zh/business/resource/gyzj/gyzj.js b/src/lang/zh/business/resource/gyzj.js similarity index 100% rename from src/lang/zh/business/resource/gyzj/gyzj.js rename to src/lang/zh/business/resource/gyzj.js diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy.js similarity index 100% rename from src/lang/zh/business/resource/mjy/mjy.js rename to src/lang/zh/business/resource/mjy.js diff --git a/src/lang/zh/business/resource/resource.js b/src/lang/zh/business/resource/resource.js new file mode 100644 index 0000000..14d00f6 --- /dev/null +++ b/src/lang/zh/business/resource/resource.js @@ -0,0 +1,22 @@ +export default { + zjzt: { + rk: '入库', + yff: '已发放', + ysd: '已锁定', + dgd: '待归档', + gd: '归档', + djd: '待解档' + }, + jyzt: { + wjy: '未借阅', + djy: '待借阅', + jyz: '借阅中' + }, + jlzt: { + wsd: '未锁定', + ysd: '已锁定', + dgd: '待归档', + gd: '归档', + djd: '待解档' + }, +} diff --git a/src/lang/zh/business/resource/sj/sj.js b/src/lang/zh/business/resource/sj.js similarity index 100% rename from src/lang/zh/business/resource/sj/sj.js rename to src/lang/zh/business/resource/sj.js diff --git a/src/lang/zh/business/resource/yq/yq.js b/src/lang/zh/business/resource/yq.js similarity index 100% rename from src/lang/zh/business/resource/yq/yq.js rename to src/lang/zh/business/resource/yq.js diff --git a/src/lang/zh/business/resource/zcg/zcg.js b/src/lang/zh/business/resource/zcg.js similarity index 100% rename from src/lang/zh/business/resource/zcg/zcg.js rename to src/lang/zh/business/resource/zcg.js diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js new file mode 100644 index 0000000..530b080 --- /dev/null +++ b/src/lang/zh/business/study/studyFormPre.js @@ -0,0 +1,3 @@ +export default { + +} diff --git a/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue b/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue index 5ec40a6..bb56f79 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue @@ -7,18 +7,18 @@ G