From d9ed29ba854b59b54c283bd32d1e5d16a9abdb7b Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 15 Jan 2026 11:26:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86]=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/resource/sj.js | 1 + src/lang/zh/business/resource/sj.js | 1 + src/views/business/resource/sj/comps/Xq.vue | 11 +++++------ src/views/business/resource/sj/list.vue | 14 +++++++++----- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/lang/en/business/resource/sj.js b/src/lang/en/business/resource/sj.js index 32166d0..6fba6e0 100644 --- a/src/lang/en/business/resource/sj.js +++ b/src/lang/en/business/resource/sj.js @@ -1,6 +1,7 @@ export default { sdts: '请确认是否锁定以下麻精药', gdts: '请确认是否归档以下麻精药', + sjxq: 'Reagent Detail', mc: 'Name', bh: 'ID', ssbm: 'Department', diff --git a/src/lang/zh/business/resource/sj.js b/src/lang/zh/business/resource/sj.js index 0c7075a..9d8c5e9 100644 --- a/src/lang/zh/business/resource/sj.js +++ b/src/lang/zh/business/resource/sj.js @@ -1,6 +1,7 @@ export default { sdts: '请确认是否锁定以下麻精药', gdts: '请确认是否归档以下麻精药', + sjxq: '试剂详情', mc: '名称', bh: '编号', ssbm: '所属部门', diff --git a/src/views/business/resource/sj/comps/Xq.vue b/src/views/business/resource/sj/comps/Xq.vue index c0a0543..2a4608f 100644 --- a/src/views/business/resource/sj/comps/Xq.vue +++ b/src/views/business/resource/sj/comps/Xq.vue @@ -9,10 +9,9 @@
{{$t('form.cancel')}} - {{ $t('form.export') }}
-
{{ $t('page.business.resource.mjy.mjyxq') }}
+
{{ $t('page.business.resource.sj.sjxq') }}
@@ -89,21 +88,21 @@
{{ $t('page.business.resource.sj.ssbd') }}
- +
{{ $t('page.business.resource.sj.bdsssy') }}
- +
{{ $t('page.business.resource.sj.bdssr') }}
- +
{{ $t('page.business.resource.sj.bdssbm') }}
- +
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue index 8e1661c..331dc9f 100644 --- a/src/views/business/resource/sj/list.vue +++ b/src/views/business/resource/sj/list.vue @@ -17,7 +17,7 @@ - @@ -97,12 +97,16 @@ - - + + - + + + - + From e408eff0c0d19395e2e99aea9392ca9c2ea23eb8 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 15 Jan 2026 12:08:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=A1=A8=E5=8D=95=E7=AD=BE=E5=90=8D=E6=84=8F?= =?UTF-8?q?=E4=B9=89=E4=B8=AD=E8=8B=B1=E6=96=87]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/resource/gyzj.js | 4 +- src/lang/en/business/resource/mjy.js | 2 - src/lang/en/business/study/studyFormApply.js | 119 +++++++++--------- src/lang/en/business/study/studyFormFill.js | 137 +++++++++++--------- src/lang/en/business/study/studyFormPlan.js | 93 +++++++------- src/lang/en/business/study/studyFormPre.js | 71 ++++++----- src/lang/zh/business/resource/gyzj.js | 4 +- src/lang/zh/business/resource/mjy.js | 2 - src/lang/zh/business/study/studyFormApply.js | 121 +++++++++--------- src/lang/zh/business/study/studyFormFill.js | 139 +++++++++++---------- src/lang/zh/business/study/studyFormPlan.js | 10 +- src/lang/zh/business/study/studyFormPre.js | 73 +++++------ src/views/business/resource/gyzj/comps/gyzj/Bj.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Shxgkc.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Bj.vue | 2 +- .../business/resource/mjy/comps/mjy/Shxgkc.vue | 2 +- src/views/business/study/comp/jhbd/Bj.vue | 2 +- src/views/business/study/comp/jhbd/Fh.vue | 6 +- src/views/business/study/comp/jhbd/Ghgsr.vue | 2 +- src/views/business/study/comp/jhbd/Sy.vue | 2 +- src/views/business/study/comp/sqbd/Bj.vue | 2 +- src/views/business/study/comp/sqbd/Fh.vue | 5 +- src/views/business/study/comp/sqbd/Fz.vue | 2 +- src/views/business/study/comp/sqbd/Ghgsr.vue | 2 +- src/views/business/study/comp/sqbd/Jq.vue | 8 +- src/views/business/study/comp/sqbd/Qrfz.vue | 2 +- src/views/business/study/comp/sqbd/Sh.vue | 5 +- src/views/business/study/comp/sqbd/Sy.vue | 2 +- src/views/business/study/comp/sqbd/Xq.vue | 2 +- src/views/business/study/comp/tbbd/Bj.vue | 6 +- src/views/business/study/comp/tbbd/Fh.vue | 30 +++-- src/views/business/study/comp/tbbd/Fz.vue | 2 +- src/views/business/study/comp/tbbd/Gc.vue | 6 +- src/views/business/study/comp/tbbd/Ghgsr.vue | 2 +- src/views/business/study/comp/tbbd/Jq.vue | 8 +- src/views/business/study/comp/tbbd/Qrfz.vue | 2 +- src/views/business/study/comp/tbbd/Sy.vue | 2 +- src/views/business/study/comp/tbbd/Xq.vue | 2 +- src/views/business/study/comp/ytbd/Bj.vue | 6 +- src/views/business/study/comp/ytbd/Sh.vue | 4 +- src/views/business/study/comp/ytbd/Xq.vue | 2 +- 41 files changed, 473 insertions(+), 424 deletions(-) diff --git a/src/lang/en/business/resource/gyzj.js b/src/lang/en/business/resource/gyzj.js index 565f3d1..1705e99 100644 --- a/src/lang/en/business/resource/gyzj.js +++ b/src/lang/en/business/resource/gyzj.js @@ -78,7 +78,6 @@ export default { jiaqian: '加签', gyzjgl: '给药制剂管理', ffhsjl: '发放回收记录', - bdxx: '表单信息', jbxx: '基本信息', rkwz: '入库位置', @@ -103,7 +102,6 @@ export default { qrrk: '确认入库', qmr1Id: '签名人1', qmr2Id: '签名人2', - lqff: '领取发放', sqgd: '申请归档', sqjd: '申请解档', @@ -114,7 +112,7 @@ export default { tyjjbj: '同意/拒绝编辑', tyjjxgkc: '同意/拒绝修改库存', gyzjrk: '给药制剂入库', - + ruku: '入库', xgkc: '修改库存', bcsm: '补充说明', jsffjl: '解锁发放记录', diff --git a/src/lang/en/business/resource/mjy.js b/src/lang/en/business/resource/mjy.js index 06aaf16..d43cd7a 100644 --- a/src/lang/en/business/resource/mjy.js +++ b/src/lang/en/business/resource/mjy.js @@ -24,7 +24,6 @@ export default { yslqr2: '钥匙2领取人', kgy1: '库管员', kgy2: '库管员2', - plff: '批量发放', plczyj: '批量处置药剂', plczrq: '批量处置容器', @@ -108,7 +107,6 @@ export default { ssbd:'所属表单', qmr1Id:'签名人1', qmr2Id:'签名人2', - lqff:'领取发放', sqgd:'申请归档', sqjd:'申请解档', diff --git a/src/lang/en/business/study/studyFormApply.js b/src/lang/en/business/study/studyFormApply.js index f5e392e..3f2c577 100644 --- a/src/lang/en/business/study/studyFormApply.js +++ b/src/lang/en/business/study/studyFormApply.js @@ -1,59 +1,64 @@ export default { - jcsz:'Setup', - bdtb:'Form filling', - xzbd:'Create', - fh:'QC', - jq:'Sign', - ghgsr:'Change Owner', - sy:'Review', - fz:'Abandon', - qrfz:'Confirm', - gc:'View', - bdsm:'Description', - zc:'Save', - next:'Next', - save:'Save', - pre:'Pre', - submit:'Submit', - qmxx: 'Signature Information', - qmr: 'Signed By', - qmyy: 'Purpose', - qmsj: 'Date', - bzyy: 'Comment', - jcgj:'Track Record', - cjjl:'Create', - sfbl:'Is Back Entry', - yes:'Yes', - no:'No', - tjjl:'Submit Record', - sqfz:'申请废止', - dcqbjcgj:'导出(全部稽查轨迹)', - dclcjcgj:'导出(流程稽查轨迹)', - dcbjjcgj:'导出(编辑稽查轨迹)', - dcxgjcgj:'导出(修改稽查轨迹)', - dcbhsjgj:'导出(不含数据轨迹)', - - tbz:'On-going', - ytj:'Submitted', - ywc:'Completed', - wtg:'Rejected', - yfh:'Approved', - dfz:'Pending Abandon', - yfz:'Abandoned', - - sh:'Approve', - guancha:'View', - jiaqian:'Sign', - qrfz:'Confirm', - reason:'Reason', - reject:'Reject', - approve:'Approve', - rybg:'Change of Person', - shenyue:'Review', - -fhjj:'Review rejected', -fhtg:'Review approved', -shjj:'Reject', -shtg:'Approve', -tongguo:'Approve', + jcsz: '基础设置', + bdtb: '表单填报', + xzbd: '新增表单', + fh: '复核', + jq: '加签', + ghgsr: '更换归属人', + sy: '审阅', + fz: '废止', + qrfz: '确认废止', + gc: '观察', + bdsm: '表单说明', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + sfbl: '是否为补录', + yes: '是', + no: '否', + tjjl: '提交记录', + sqfz: '申请废止', + dcqbjcgj: '导出(全部稽查轨迹)', + dclcjcgj: '导出(流程稽查轨迹)', + dcbjjcgj: '导出(编辑稽查轨迹)', + dcxgjcgj: '导出(修改稽查轨迹)', + dcbhsjgj: '导出(不含数据轨迹)', + tbz: '填报中', + ytj: '已提交', + wtg: '未通过', + yfh: '已复核', + ywc: '已完成', + dfz: '待废止', + yfz: '已废止', + sh: '审核', + guancha: '观察', + jiaqian: '加签', + qrfz: '确认废止', + reject: '拒绝', + reason: '原因', + approve: '通过', + szqk: '生长情况', + rybg: '人员变更', + shenyue: '审阅', + fhjj: '复核拒绝', + fhtg: '复核通过', + shjj: '审核拒绝', + shtg: '审核通过', + tongguo: '通过', + ksxcfh: '开始现场复核', + jsxcfh: '结束现场复核', + smxz: '申明协作', + bcsm: '补充说明', + fztgjj: '废止通过/拒绝', + ysy: '已审阅' } diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js index 3997c09..a36b399 100644 --- a/src/lang/en/business/study/studyFormFill.js +++ b/src/lang/en/business/study/studyFormFill.js @@ -1,64 +1,77 @@ 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', - fh:'QC', - jq:'Sign', - ghgsr:'Change Owner', - sy:'Review', - fz:'Abandon', - qrfz:'Confirm', - gc:'View', - bdsm:'Description', - zc:'Save', - next:'Next', - save:'Save', - pre:'Pre', - submit:'Submit', - qmxx: 'Signature Information', - qmr: 'Signed By', - qmyy: 'Purpose', - qmsj: 'Date', - bzyy: 'Comment', - jcgj:'Track Record', - cjjl:'Create', - sfbl:'Is Back Entry', - yes:'Yes', - no:'No', - tjjl:'Submit Record', - sqfz:'申请废止', - dcqbjcgj:'导出(全部稽查轨迹)', - dclcjcgj:'导出(流程稽查轨迹)', - dcbjjcgj:'导出(编辑稽查轨迹)', - dcxgjcgj:'导出(修改稽查轨迹)', - dcbhsjgj:'导出(不含数据轨迹)', - - ytbd:'Preset', - tbz:'On-going', - ytj:'Submitted', - ywc:'Completed', - ywcfh:'Completed & Approved', - dfz:'Pending Abandon', - yfz:'Abandoned', - - guancha:'View', - jiaqian:'Sign', - qrfz:'Confirm', - reason:'Reason', - reject:'Reject', - approve:'Approve', - szqk:'生长情况', - rybg:'Change of Person', - shenyue:'Review', - fhjj:'Review rejected', - fhtg:'Review approved', - tongguo:'Approve', + mc: '名称', + bh: '编号', + syl: '使用量', + cz: '处置', + tjcz: '添加处置', + cc: '存储', + tjcc: '添加存储', + yltj: '用量统计', + jcsz: '基础设置', + bdtb: '表单填报', + xzbd: '新增表单', + fh: '复核', + jq: '加签', + ghgsr: '更换归属人', + sy: '审阅', + fz: '废止', + qrfz: '确认废止', + gc: '观察', + bdsm: '表单说明', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + sfbl: '是否为补录', + yes: '是', + no: '否', + tjjl: '提交记录', + sqfz: '申请废止', + dcqbjcgj: '导出(全部稽查轨迹)', + dclcjcgj: '导出(流程稽查轨迹)', + dcbjjcgj: '导出(编辑稽查轨迹)', + dcxgjcgj: '导出(修改稽查轨迹)', + dcbhsjgj: '导出(不含数据轨迹)', + ytbd: '预填表单', + tbz: '填报中', + ytj: '已提交', + ywc: '已完成', + ywcfh: '已完成（经复核）', + ywc: '已完成', + dfz: '待废止', + yfz: '已废止', + guancha: '观察', + jiaqian: '加签', + qrfz: '确认废止', + reject: '拒绝', + reason: '原因', + approve: '通过', + szqk: '生长情况', + rybg: '人员变更', + shenyue: '审阅', + fhjj: '复核拒绝', + fhtg: '复核通过', + tongguo: '通过', + txbtjjl: '填写并提交记录', + zztjyzbd: '制作提交预制表单', + mfhtg: '免复核通过', + lianghao: '良好', + zhong: '中', + cha: '差', + ksxcfh: '开始现场复核', + jsxcfh: '结束现场复核', + smxz: '申明协作', + bcsm: '补充说明', + fztgjj: '废止通过/拒绝', + ysy: '已审阅', + cjjl: '创建记录' } diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js index 63b217b..c22a312 100644 --- a/src/lang/en/business/study/studyFormPlan.js +++ b/src/lang/en/business/study/studyFormPlan.js @@ -1,52 +1,55 @@ export default { - jcsz: 'Setup', - bdtb: 'Preset Design', - xzbd: 'Create', - fh: 'QC', - ghgsr: 'Change Owner', - sy: 'Review', - gc: 'View', - bdsm: 'Description', - zc: 'Save', - next:'Next', - save:'Save', - pre:'Pre', - submit:'Submit', - qmxx: 'Signature Information', - qmr: 'Signed By', - qmyy: 'Purpose', - qmsj: 'Date', - bzyy: 'Comment', - jcgj: 'Track Record', - xzpzjhb:'Create', - yes:'Yes', - no:'No', - shryId:'QC User', - tjjl: 'Submit Record', + jcsz: '基础设置', + bdtb: '表单填报', + xzbd: '新增表单', + fh: '复核', + ghgsr: '更换归属人', + sy: '审阅', + gc: '观察', + bdsm: '表单说明', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + xzpzjhb: '新增配置计划表', + yes: '是', + shryId: '复核人员', + no: '否', + tjjl: '提交记录', dcqbjcgj: '导出(全部稽查轨迹)', dclcjcgj: '导出(流程稽查轨迹)', dcbjjcgj: '导出(编辑稽查轨迹)', dcxgjcgj: '导出(修改稽查轨迹)', dcbhsjgj: '导出(不含数据轨迹)', - rybg: 'Change of Person', - tbz: 'On-going', - ytj: 'Submitted', - ywcfh: 'Completed & Approved', - ywc: 'Completed', - reject: 'Reject', - reason: 'Reason', - approve: 'Approve', - shenyue: 'Review', - fhjj:'Review rejected', - fhtg:'Review approved', - tongguo: 'Approve', - syxx: 'Information', - symc: 'Study Name', - sybh: 'Study Number', - syfzr: 'Study Director', - cjsj: 'Creation Date', - sdsy: 'Lock Study', - syjj: 'Description', - xz: 'Create', - syxkxx: 'Discipline' + rybg: '人员变更', + tbz: '填报中', + ytj: '已提交', + ywcfh: '已完成（经复核）', + ywc: '已完成', + reject: '拒绝', + reason: '原因', + approve: '通过', + shenyue: '审阅', + fhjj: '复核拒绝', + fhtg: '复核通过', + tongguo: '通过', + syxx: '试验信息', + symc: '试验名称', + sybh: '试验编号', + syfzr: '试验负责人', + cjsj: '创建时间', + sdsy: '锁定试验', + syjj: '试验简介', + xz: '新增配置计划表', + syxkxx: '试验学科信息', + ysy: '已审阅' } diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js index 6c3738d..02e8853 100644 --- a/src/lang/en/business/study/studyFormPre.js +++ b/src/lang/en/business/study/studyFormPre.js @@ -1,35 +1,40 @@ export default { - jcsz:'Setup', - bdsj:'Preset Design', - xzbd:'Create', - zc:'Save', - next:'Next', - save:'Save', - submit:'Submit', - bdsm:'Description', - tjysb:'Submit', - shryId:'Reviewer', - fzrsh:'是否需要试验负责人审核', - approve:'Approve', - reject:'Reject', - shtg:'Approve', - shjj:'Reject', - pre:'Pre', - tb:'填报', - qmxx: 'Signature Information', - qmr: 'Signed By', - qmyy: 'Purpose', - qmsj: 'Date', - bzyy: 'Comment', - jcgj:'Track Record', - cjjl:'Create', - xjbd:'Create Preset', - fzbdxz:'Copy Existing Preset', - sssyfsy:'Study/Non-study', - fzbd:'Copy Preset', - yulan:'Preview', - fzbj:'Copy and Edit', - ts:'是否确定用该预填模板进行实际填报？', - cjxbd:'Create Preset', - fzyybd:'Copy Existing Preset', + jcsz: '基础设置', + bdsj: '表单设计', + xzbd: '新增表单', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdsm: '表单说明', + tjysb: '提交预设表', + shryId: '审核人员', + fzrsh: '是否需要试验负责人审核', + approve: '通过', + reject: '拒绝', + reject: '拒绝', + shtg: '审核通过', + shjj: '审核拒绝', + tb: '填报', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + xjbd: '新建表单', + fzbdxz: '复制表单选择', + sssyfsy: '所属试验/非试验', + fzbd: '复制表单', + fzbj: '复制编辑', + yulan: '预览', + ts: '是否确定用该预填模板进行实际填报？', + cjxbd: '创建新表单', + fzyybd: '复制已有表单', + yes: '是', + no: '否', + zztjyzbd: '制作提交预制表单' } diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js index b58622a..1705e99 100644 --- a/src/lang/zh/business/resource/gyzj.js +++ b/src/lang/zh/business/resource/gyzj.js @@ -78,7 +78,6 @@ export default { jiaqian: '加签', gyzjgl: '给药制剂管理', ffhsjl: '发放回收记录', - bdxx: '表单信息', jbxx: '基本信息', rkwz: '入库位置', @@ -103,7 +102,6 @@ export default { qrrk: '确认入库', qmr1Id: '签名人1', qmr2Id: '签名人2', - lqff: '领取发放', sqgd: '申请归档', sqjd: '申请解档', @@ -114,7 +112,7 @@ export default { tyjjbj: '同意/拒绝编辑', tyjjxgkc: '同意/拒绝修改库存', gyzjrk: '给药制剂入库', - ruku:'入库', + ruku: '入库', xgkc: '修改库存', bcsm: '补充说明', jsffjl: '解锁发放记录', diff --git a/src/lang/zh/business/resource/mjy.js b/src/lang/zh/business/resource/mjy.js index 06aaf16..d43cd7a 100644 --- a/src/lang/zh/business/resource/mjy.js +++ b/src/lang/zh/business/resource/mjy.js @@ -24,7 +24,6 @@ export default { yslqr2: '钥匙2领取人', kgy1: '库管员', kgy2: '库管员2', - plff: '批量发放', plczyj: '批量处置药剂', plczrq: '批量处置容器', @@ -108,7 +107,6 @@ export default { ssbd:'所属表单', qmr1Id:'签名人1', qmr2Id:'签名人2', - lqff:'领取发放', sqgd:'申请归档', sqjd:'申请解档', diff --git a/src/lang/zh/business/study/studyFormApply.js b/src/lang/zh/business/study/studyFormApply.js index 3742dd9..3f2c577 100644 --- a/src/lang/zh/business/study/studyFormApply.js +++ b/src/lang/zh/business/study/studyFormApply.js @@ -1,61 +1,64 @@ export default { - jcsz:'基础设置', - bdtb:'表单填报', - xzbd:'新增表单', - fh:'复核', - jq:'加签', - ghgsr:'更换归属人', - sy:'审阅', - fz:'废止', - qrfz:'确认废止', - gc:'观察', - bdsm:'表单说明', - zc:'暂存', - next:'下一步', - pre:'上一步', - save:'保存', - submit:'提交', - bdnr:'表单内容', - qmxx:'签名信息', - qmr:'签名人', - qmyy:'签名意义', - qmsj:'签名时间', - bzyy:'备注原因', - jcgj:'稽查轨迹', - cjjl:'创建记录', - sfbl:'是否为补录', - yes:'是', - no:'否', - tjjl:'提交记录', -sqfz:'申请废止', - dcqbjcgj:'导出(全部稽查轨迹)', - dclcjcgj:'导出(流程稽查轨迹)', - dcbjjcgj:'导出(编辑稽查轨迹)', - dcxgjcgj:'导出(修改稽查轨迹)', - dcbhsjgj:'导出(不含数据轨迹)', - - tbz:'填报中', - ytj:'已提交', - wtg:'未通过', - yfh:'已复核', - ywc:'已完成', - dfz:'待废止', - yfz:'已废止', - - sh:'审核', - guancha:'观察', - jiaqian:'加签', - qrfz:'确认废止', - reject:'拒绝', - reason:'原因', - approve:'通过', -szqk:'生长情况', -rybg:'人员变更', -shenyue:'审阅', -fhjj:'复核拒绝', -fhtg:'复核通过', -shjj:'审核拒绝', -shtg:'审核通过', -tongguo:'通过', - + jcsz: '基础设置', + bdtb: '表单填报', + xzbd: '新增表单', + fh: '复核', + jq: '加签', + ghgsr: '更换归属人', + sy: '审阅', + fz: '废止', + qrfz: '确认废止', + gc: '观察', + bdsm: '表单说明', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + sfbl: '是否为补录', + yes: '是', + no: '否', + tjjl: '提交记录', + sqfz: '申请废止', + dcqbjcgj: '导出(全部稽查轨迹)', + dclcjcgj: '导出(流程稽查轨迹)', + dcbjjcgj: '导出(编辑稽查轨迹)', + dcxgjcgj: '导出(修改稽查轨迹)', + dcbhsjgj: '导出(不含数据轨迹)', + tbz: '填报中', + ytj: '已提交', + wtg: '未通过', + yfh: '已复核', + ywc: '已完成', + dfz: '待废止', + yfz: '已废止', + sh: '审核', + guancha: '观察', + jiaqian: '加签', + qrfz: '确认废止', + reject: '拒绝', + reason: '原因', + approve: '通过', + szqk: '生长情况', + rybg: '人员变更', + shenyue: '审阅', + fhjj: '复核拒绝', + fhtg: '复核通过', + shjj: '审核拒绝', + shtg: '审核通过', + tongguo: '通过', + ksxcfh: '开始现场复核', + jsxcfh: '结束现场复核', + smxz: '申明协作', + bcsm: '补充说明', + fztgjj: '废止通过/拒绝', + ysy: '已审阅' } diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 442bff2..a36b399 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -1,66 +1,77 @@ export default { - mc:'名称', - bh:'编号', - syl:'使用量', - cz:'处置', - tjcz:'添加处置', - cc:'存储', - tjcc:'添加存储', - yltj:'用量统计', - jcsz:'基础设置', - bdtb:'表单填报', - xzbd:'新增表单', - fh:'复核', - jq:'加签', - ghgsr:'更换归属人', - sy:'审阅', - fz:'废止', - qrfz:'确认废止', - gc:'观察', - bdsm:'表单说明', - zc:'暂存', - next:'下一步', - pre:'上一步', - save:'保存', - submit:'提交', - bdnr:'表单内容', - qmxx:'签名信息', - qmr:'签名人', - qmyy:'签名意义', - qmsj:'签名时间', - bzyy:'备注原因', - jcgj:'稽查轨迹', - cjjl:'创建记录', - sfbl:'是否为补录', - yes:'是', - no:'否', - tjjl:'提交记录', - sqfz:'申请废止', - dcqbjcgj:'导出(全部稽查轨迹)', - dclcjcgj:'导出(流程稽查轨迹)', - dcbjjcgj:'导出(编辑稽查轨迹)', - dcxgjcgj:'导出(修改稽查轨迹)', - dcbhsjgj:'导出(不含数据轨迹)', -ytbd:'预填表单', - tbz:'填报中', - ytj:'已提交', - ywc:'已完成', - ywcfh:'已完成（经复核）', - ywc:'已完成', - dfz:'待废止', - yfz:'已废止', - - guancha:'观察', - jiaqian:'加签', - qrfz:'确认废止', - reject:'拒绝', - reason:'原因', - approve:'通过', - szqk:'生长情况', - rybg:'人员变更', - shenyue:'审阅', - fhjj:'复核拒绝', - fhtg:'复核通过', - tongguo:'通过', - + mc: '名称', + bh: '编号', + syl: '使用量', + cz: '处置', + tjcz: '添加处置', + cc: '存储', + tjcc: '添加存储', + yltj: '用量统计', + jcsz: '基础设置', + bdtb: '表单填报', + xzbd: '新增表单', + fh: '复核', + jq: '加签', + ghgsr: '更换归属人', + sy: '审阅', + fz: '废止', + qrfz: '确认废止', + gc: '观察', + bdsm: '表单说明', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + sfbl: '是否为补录', + yes: '是', + no: '否', + tjjl: '提交记录', + sqfz: '申请废止', + dcqbjcgj: '导出(全部稽查轨迹)', + dclcjcgj: '导出(流程稽查轨迹)', + dcbjjcgj: '导出(编辑稽查轨迹)', + dcxgjcgj: '导出(修改稽查轨迹)', + dcbhsjgj: '导出(不含数据轨迹)', + ytbd: '预填表单', + tbz: '填报中', + ytj: '已提交', + ywc: '已完成', + ywcfh: '已完成（经复核）', + ywc: '已完成', + dfz: '待废止', + yfz: '已废止', + guancha: '观察', + jiaqian: '加签', + qrfz: '确认废止', + reject: '拒绝', + reason: '原因', + approve: '通过', + szqk: '生长情况', + rybg: '人员变更', + shenyue: '审阅', + fhjj: '复核拒绝', + fhtg: '复核通过', + tongguo: '通过', + txbtjjl: '填写并提交记录', + zztjyzbd: '制作提交预制表单', + mfhtg: '免复核通过', + lianghao: '良好', + zhong: '中', + cha: '差', + ksxcfh: '开始现场复核', + jsxcfh: '结束现场复核', + smxz: '申明协作', + bcsm: '补充说明', + fztgjj: '废止通过/拒绝', + ysy: '已审阅', + cjjl: '创建记录' } diff --git a/src/lang/zh/business/study/studyFormPlan.js b/src/lang/zh/business/study/studyFormPlan.js index af8ab87..c22a312 100644 --- a/src/lang/zh/business/study/studyFormPlan.js +++ b/src/lang/zh/business/study/studyFormPlan.js @@ -9,7 +9,7 @@ export default { bdsm: '表单说明', zc: '暂存', next: '下一步', - pre:'上一步', + pre: '上一步', save: '保存', submit: '提交', bdnr: '表单内容', @@ -20,9 +20,9 @@ export default { bzyy: '备注原因', jcgj: '稽查轨迹', cjjl: '创建记录', - xzpzjhb:'新增配置计划表', + xzpzjhb: '新增配置计划表', yes: '是', - shryId:'复核人员', + shryId: '复核人员', no: '否', tjjl: '提交记录', dcqbjcgj: '导出(全部稽查轨迹)', @@ -35,7 +35,6 @@ export default { ytj: '已提交', ywcfh: '已完成（经复核）', ywc: '已完成', - reject: '拒绝', reason: '原因', approve: '通过', @@ -51,5 +50,6 @@ export default { sdsy: '锁定试验', syjj: '试验简介', xz: '新增配置计划表', - syxkxx: '试验学科信息' + syxkxx: '试验学科信息', + ysy: '已审阅' } diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js index b1e49ee..02e8853 100644 --- a/src/lang/zh/business/study/studyFormPre.js +++ b/src/lang/zh/business/study/studyFormPre.js @@ -1,37 +1,40 @@ export default { - jcsz:'基础设置', - bdsj:'表单设计', - xzbd:'新增表单', - zc:'暂存', - next:'下一步', - pre:'上一步', - save:'保存', - submit:'提交', - bdsm:'表单说明', - tjysb:'提交预设表', - shryId:'审核人员', - fzrsh:'是否需要试验负责人审核', - approve:'通过', - reject:'拒绝', - reject:'拒绝', - shtg:'审核通过', - shjj:'审核拒绝', - tb:'填报', - bdnr:'表单内容', - qmxx:'签名信息', - qmr:'签名人', - qmyy:'签名意义', - qmsj:'签名时间', - bzyy:'备注原因', - jcgj:'稽查轨迹', - cjjl:'创建记录', - xjbd:'新建表单', - fzbdxz:'复制表单选择', - sssyfsy:'所属试验/非试验', - fzbd:'复制表单', - fzbj:'复制编辑', - yulan:'预览', - ts:'是否确定用该预填模板进行实际填报？', - cjxbd:'创建新表单', - fzyybd:'复制已有表单', + jcsz: '基础设置', + bdsj: '表单设计', + xzbd: '新增表单', + zc: '暂存', + next: '下一步', + pre: '上一步', + save: '保存', + submit: '提交', + bdsm: '表单说明', + tjysb: '提交预设表', + shryId: '审核人员', + fzrsh: '是否需要试验负责人审核', + approve: '通过', + reject: '拒绝', + reject: '拒绝', + shtg: '审核通过', + shjj: '审核拒绝', + tb: '填报', + bdnr: '表单内容', + qmxx: '签名信息', + qmr: '签名人', + qmyy: '签名意义', + qmsj: '签名时间', + bzyy: '备注原因', + jcgj: '稽查轨迹', + cjjl: '创建记录', + xjbd: '新建表单', + fzbdxz: '复制表单选择', + sssyfsy: '所属试验/非试验', + fzbd: '复制表单', + fzbj: '复制编辑', + yulan: '预览', + ts: '是否确定用该预填模板进行实际填报？', + cjxbd: '创建新表单', + fzyybd: '复制已有表单', + yes: '是', + no: '否', + zztjyzbd: '制作提交预制表单' } diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue index 9ad5fb5..268daa7 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue @@ -167,7 +167,7 @@ export default { cctj: null, ccwz: null, qmrmm: null, - qmyy: this.$t('page.form.edit'), + qmyy: this.$t('form.edit'), bjbz: '' } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue index 1f8fc6a..5d98018 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue @@ -44,7 +44,7 @@ - + diff --git a/src/views/business/resource/mjy/comps/mjy/Bj.vue b/src/views/business/resource/mjy/comps/mjy/Bj.vue index b9c90e8..1aba9da 100644 --- a/src/views/business/resource/mjy/comps/mjy/Bj.vue +++ b/src/views/business/resource/mjy/comps/mjy/Bj.vue @@ -167,7 +167,7 @@ export default { cctj: null, ccwz: null, qmrmm: null, - qmyy: this.$t('page.form.edit'), + qmyy: this.$t('form.edit'), bjbz: '' } this.resetForm("form") diff --git a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue index 523e3f7..eeeae36 100644 --- a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue +++ b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue @@ -44,7 +44,7 @@ - + diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index 7e7ed82..a3143cc 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -221,7 +221,7 @@ export default { }, edit(row) { this.reset() - this.form.qmyy = '制作提交预制表单' + this.form.qmyy = this.$t('page.business.study.studyFormPlan.cjjl') if (row && row.id) { this.showIndex = 2 this.$modal.loading() diff --git a/src/views/business/study/comp/jhbd/Fh.vue b/src/views/business/study/comp/jhbd/Fh.vue index 6ba8d9d..54c4ba8 100644 --- a/src/views/business/study/comp/jhbd/Fh.vue +++ b/src/views/business/study/comp/jhbd/Fh.vue @@ -59,7 +59,7 @@ - @@ -209,10 +209,13 @@ export default { this.formApprove.bdnr = JSON.stringify(content) this.formApprove.id = this.form.id this.formApprove.qmyy = qmyy + this.formApprove.qmyyMc = qmyy if (qmyy == '复核通过') { this.openTitle = 'page.business.study.studyFormPlan.fhtg' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormPlan.fhtg') } else if (qmyy == '复核拒绝') { this.openTitle = 'page.business.study.studyFormPlan.fhjj' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormPlan.fhtg') } } @@ -222,6 +225,7 @@ export default { this.formApprove = { id: null, qmyy: '', + qmyyMc: '', bdnr: '', remark: '', reason: '', diff --git a/src/views/business/study/comp/jhbd/Ghgsr.vue b/src/views/business/study/comp/jhbd/Ghgsr.vue index 9841175..4fcd0ca 100644 --- a/src/views/business/study/comp/jhbd/Ghgsr.vue +++ b/src/views/business/study/comp/jhbd/Ghgsr.vue @@ -93,7 +93,7 @@ export default { reset() { this.form = { id: null, - qmyy: '更换归属人', + qmyy: this.$t('page.business.study.studyFormPlan.ghgsr'), userId: null, UserMc: null, remark: null, diff --git a/src/views/business/study/comp/jhbd/Sy.vue b/src/views/business/study/comp/jhbd/Sy.vue index b076a5f..bd900ea 100644 --- a/src/views/business/study/comp/jhbd/Sy.vue +++ b/src/views/business/study/comp/jhbd/Sy.vue @@ -196,7 +196,7 @@ export default { resetApprove() { this.formApprove = { id: null, - qmyy: '已审阅', + qmyy:this.$t('page.business.study.studyFormPlan.ysy'), remark: '', qmrmm: '', } diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index b14d0b3..a672c6e 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -220,7 +220,7 @@ export default { fzrsh: null, shryId: null, sfbl: null, - qmyy: '制作提交预制表单', + qmyy: this.$t('page.business.study.studyFormApply.cjjl'), shryMc: null, } this.resetForm("form") diff --git a/src/views/business/study/comp/sqbd/Fh.vue b/src/views/business/study/comp/sqbd/Fh.vue index 625f73c..8fac1e5 100644 --- a/src/views/business/study/comp/sqbd/Fh.vue +++ b/src/views/business/study/comp/sqbd/Fh.vue @@ -59,7 +59,7 @@ - @@ -210,8 +210,10 @@ export default { this.formApprove.qmyy = qmyy if (qmyy == '复核通过') { this.openTitle = 'page.business.study.studyFormApply.fhtg' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.fhtg') } else if (qmyy == '复核拒绝') { this.openTitle = 'page.business.study.studyFormApply.fhjj' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.fhjj') } } }, @@ -219,6 +221,7 @@ export default { this.formApprove = { id: null, qmyy: '', + qmyyMc: '', bdnr: '', remark: '', reason: '', diff --git a/src/views/business/study/comp/sqbd/Fz.vue b/src/views/business/study/comp/sqbd/Fz.vue index ce35cbd..5e36df3 100644 --- a/src/views/business/study/comp/sqbd/Fz.vue +++ b/src/views/business/study/comp/sqbd/Fz.vue @@ -88,7 +88,7 @@ export default { reset() { this.form = { id: null, - qmyy: '申请废止', + qmyy: this.$t('page.business.study.studyFormApply.sqfz'), remark: null, qmrmm: null } diff --git a/src/views/business/study/comp/sqbd/Ghgsr.vue b/src/views/business/study/comp/sqbd/Ghgsr.vue index 8966740..993807b 100644 --- a/src/views/business/study/comp/sqbd/Ghgsr.vue +++ b/src/views/business/study/comp/sqbd/Ghgsr.vue @@ -93,7 +93,7 @@ export default { reset() { this.form = { id: null, - qmyy: '更换归属人', + qmyy: this.$t('page.business.study.studyFormApply.ghgsr'), userId: null, UserMc: null, remark: null, diff --git a/src/views/business/study/comp/sqbd/Jq.vue b/src/views/business/study/comp/sqbd/Jq.vue index 715350f..c994624 100644 --- a/src/views/business/study/comp/sqbd/Jq.vue +++ b/src/views/business/study/comp/sqbd/Jq.vue @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/src/views/business/study/comp/sqbd/Qrfz.vue b/src/views/business/study/comp/sqbd/Qrfz.vue index 7fbdcf5..ad802d0 100644 --- a/src/views/business/study/comp/sqbd/Qrfz.vue +++ b/src/views/business/study/comp/sqbd/Qrfz.vue @@ -88,7 +88,7 @@ export default { reset() { this.form = { id: null, - qmyymc: '废止通过/拒绝', + qmyymc: $t('page.business.study.studyFormApply.fztgjj'), qmyy: null, remark: null, qmrmm: null diff --git a/src/views/business/study/comp/sqbd/Sh.vue b/src/views/business/study/comp/sqbd/Sh.vue index 222a914..0b5acd8 100644 --- a/src/views/business/study/comp/sqbd/Sh.vue +++ b/src/views/business/study/comp/sqbd/Sh.vue @@ -59,7 +59,7 @@ - @@ -208,14 +208,17 @@ export default { this.formApprove.qmyy = qmyy if (qmyy == '审核通过') { this.openTitle = 'page.business.study.studyFormApply.shtg' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.shtg') } else if (qmyy == '审核拒绝') { this.openTitle = 'page.business.study.studyFormApply.shjj' + this.formApprove.qmyyMc = this.$t('page.business.study.studyFormApply.shjj') } }, resetApprove() { this.formApprove = { id: null, qmyy: '', + qmyyMc: '', bdnr: '', remark: '', reason: '', diff --git a/src/views/business/study/comp/sqbd/Sy.vue b/src/views/business/study/comp/sqbd/Sy.vue index 2772739..acb7c3d 100644 --- a/src/views/business/study/comp/sqbd/Sy.vue +++ b/src/views/business/study/comp/sqbd/Sy.vue @@ -195,7 +195,7 @@ export default { resetApprove() { this.formApprove = { id: null, - qmyy: '已审阅', + qmyy: $t('page.business.study.studyFormApply.ysy'), remark: '', bdnr: '', qmrmm: '', diff --git a/src/views/business/study/comp/sqbd/Xq.vue b/src/views/business/study/comp/sqbd/Xq.vue index 3a71cda..2b1d00d 100644 --- a/src/views/business/study/comp/sqbd/Xq.vue +++ b/src/views/business/study/comp/sqbd/Xq.vue @@ -124,7 +124,7 @@ export default { openApprove: false, formApprove: { id: null, - qmyy: '创建记录', + qmyy: $t('page.business.study.studyFormApply.cjjl'), remark: '', qmrmm: '', }, diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index bbe2ea7..a989d35 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -263,7 +263,7 @@ export default { openApprove: false, formApprove: { id: null, - qmyy: '填写并提交记录', + qmyy: this.$t('page.business.study.studyFormFill.txbtjjl'), remark: '', bdnr: '', resource: '', @@ -347,7 +347,7 @@ export default { this.$modal.loading() studyFormFill_info({ id: formId }).then(response => { this.form = response.data - this.form.qmyy = '制作提交预制表单' + this.form.qmyy = this.$t('page.business.study.studyFormFill.zztjyzbd') this.$modal.closeLoading() }) } else { @@ -411,7 +411,7 @@ export default { resetApprove() { this.formApprove = { id: null, - qmyy: '填写并提交记录', + qmyy: this.$t('page.business.study.studyFormFill.txbtjjl'), remark: '', bdnr: '', resource: '', diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue index a3c7e46..8a53ffa 100644 --- a/src/views/business/study/comp/tbbd/Fh.vue +++ b/src/views/business/study/comp/tbbd/Fh.vue @@ -62,7 +62,7 @@ - @@ -111,7 +111,7 @@ diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue index a46d2e0..cbecbea 100644 --- a/src/views/business/resource/sj/comps/Gd.vue +++ b/src/views/business/resource/sj/comps/Gd.vue @@ -92,7 +92,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请归档', + qmyy: this.$t('page.business.resource.sj.sqgd'), sdrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/sj/comps/Gh.vue b/src/views/business/resource/sj/comps/Gh.vue deleted file mode 100644 index 5efbf2c..0000000 --- a/src/views/business/resource/sj/comps/Gh.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - diff --git a/src/views/business/resource/sj/comps/Jd.vue b/src/views/business/resource/sj/comps/Jd.vue index 04d9129..2b0c198 100644 --- a/src/views/business/resource/sj/comps/Jd.vue +++ b/src/views/business/resource/sj/comps/Jd.vue @@ -92,7 +92,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请解档', + qmyy: this.$t('page.business.resource.sj.sqjd'), sdrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue index be4c24d..4d85e42 100644 --- a/src/views/business/resource/sj/comps/Js.vue +++ b/src/views/business/resource/sj/comps/Js.vue @@ -80,7 +80,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '解锁试剂', + qmyy: this.$t('page.business.resource.sj.jssj'), sdrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/sj/comps/Jy.vue b/src/views/business/resource/sj/comps/Jy.vue index 1d4f209..1c07930 100644 --- a/src/views/business/resource/sj/comps/Jy.vue +++ b/src/views/business/resource/sj/comps/Jy.vue @@ -105,7 +105,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请借阅', + qmyy: this.$t('page.business.resource.sj.sqjy'), sdrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue index 05372db..5eb11dc 100644 --- a/src/views/business/resource/sj/comps/Sd.vue +++ b/src/views/business/resource/sj/comps/Sd.vue @@ -92,7 +92,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '锁定试剂', + qmyy: this.$t('page.business.resource.sj.sdsj'), sdrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue index 410a8e0..269016e 100644 --- a/src/views/business/resource/sj/comps/Xgkc.vue +++ b/src/views/business/resource/sj/comps/Xgkc.vue @@ -108,7 +108,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '修改库存', + qmyy: this.$t('page.business.resource.sj.xgkc'), sdrmm: null, kc: '', kcdw: '', diff --git a/src/views/business/resource/sj/comps/Ysff.vue b/src/views/business/resource/sj/comps/Ysff.vue deleted file mode 100644 index 7f97726..0000000 --- a/src/views/business/resource/sj/comps/Ysff.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue index 474a6bf..b545201 100644 --- a/src/views/business/resource/yq/list.vue +++ b/src/views/business/resource/yq/list.vue @@ -191,7 +191,7 @@ export default { }, // 表单参数 form: { - 'qmyy': '新增仪器' + 'qmyy': this.$t('page.form.add') }, // 表单校验 rules: { @@ -290,7 +290,7 @@ export default { const id = row.id || this.ids yq_info({ id: id }).then((response) => { this.form = response.data - this.form.qmyy = '编辑仪器' + this.form.qmyy = this.$t('page.form.edit') this.open = true this.title = this.$t('form.edit') }) From 02d3ea45de0a29adab806b40164386b2321524ee Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 15 Jan 2026 13:42:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BB=AA=E5=99=A8=E7=AE=A1=E7=90=86]=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/resource/yq.js | 4 +++- src/lang/zh/business/resource/yq.js | 4 +++- src/views/business/resource/yq/list.vue | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lang/en/business/resource/yq.js b/src/lang/en/business/resource/yq.js index f8a502c..3515c24 100644 --- a/src/lang/en/business/resource/yq.js +++ b/src/lang/en/business/resource/yq.js @@ -7,5 +7,7 @@ export default { ssbm: 'Department', yqxh: 'Type', yqly: 'Source', - wc: 'Compartment' + wc: 'Compartment', + xzyq: 'Add Instrument', + bjyq: 'Edit Instrument Information' } diff --git a/src/lang/zh/business/resource/yq.js b/src/lang/zh/business/resource/yq.js index 2d27736..a5ebc04 100644 --- a/src/lang/zh/business/resource/yq.js +++ b/src/lang/zh/business/resource/yq.js @@ -8,5 +8,7 @@ export default { yqxh: '仪器型号', yqly: '仪器来源', wc: '温层', - xgnr: '修改内容' + xgnr: '修改内容', + xzyq: '新增仪器', + bjyq: '编辑仪器', } \ No newline at end of file diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue index b545201..dc5e949 100644 --- a/src/views/business/resource/yq/list.vue +++ b/src/views/business/resource/yq/list.vue @@ -263,7 +263,7 @@ export default { jzrq: null, bmId: null, wc: null, - qmyy: '新增仪器' + qmyy: this.$t('page.business.resource.yq.xzyq'), } this.resetForm('form') }, @@ -290,7 +290,7 @@ export default { const id = row.id || this.ids yq_info({ id: id }).then((response) => { this.form = response.data - this.form.qmyy = this.$t('page.form.edit') + this.form.qmyy = this.$t('page.business.resource.yq.bjyq') this.open = true this.title = this.$t('form.edit') }) From 030a36d95e0812cd7dcf6ce345177fdc2ecae042 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 15 Jan 2026 14:08:21 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/resource/gsp.js | 19 +++++++++++++++++++ src/lang/zh/business/resource/gsp.js | 20 ++++++++++++++++++++ src/views/business/resource/gsp/comps/ffjl/Gd.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jd.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jq.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Js.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jy.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Sd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Bj.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Cz.vue | 2 +- .../business/resource/gsp/comps/gsp/CzBatch.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Ff.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Gd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Gh.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Jd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Js.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Jy.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Sd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Shbj.vue | 19 +++++++++++-------- src/views/business/resource/gsp/comps/gsp/Shxgkc.vue | 19 +++++++++++-------- src/views/business/resource/gsp/comps/gsp/Xgkc.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Xz.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Ysff.vue | 4 ++-- src/views/business/resource/gsp/comps/rkjl/Bj.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Gd.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Jd.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Js.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Jy.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Sd.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Xz.vue | 2 +- 30 files changed, 88 insertions(+), 43 deletions(-) diff --git a/src/lang/en/business/resource/gsp.js b/src/lang/en/business/resource/gsp.js index 8f42739..34cb0a2 100644 --- a/src/lang/en/business/resource/gsp.js +++ b/src/lang/en/business/resource/gsp.js @@ -111,4 +111,23 @@ export default { ffjlxq: '发放回收记录详情', dr: 'Import', gd: '归档', + + bjgsp: 'Edit', + xzgsp: 'Add', + lqff: 'Distribution', + sqgd: 'Apply for Archiving', + sqjd: 'Apply for De-archiving', + gh: 'Return', + jsgsp: 'Unlock', + sqjy: 'Apply for Check-out', + sdgsp: 'Lock', + tyjjbj: '同意/拒绝编辑', + tyjjxgkc:'同意/拒绝修改库存', + bcsm: '补充说明', + jsffjl: '解锁发放记录', + sdffjl: '锁定发放记录', + bjgsprkjl: '编辑供试品入库记录', + jsgsprkjl: '解锁供试品入库记录', + sdgsprkjl: '锁定供试品入库记录', + xzgsprkjl: '新增供试品入库记录', } diff --git a/src/lang/zh/business/resource/gsp.js b/src/lang/zh/business/resource/gsp.js index d0216ef..1c01798 100644 --- a/src/lang/zh/business/resource/gsp.js +++ b/src/lang/zh/business/resource/gsp.js @@ -115,4 +115,24 @@ export default { ffjlxq: '发放回收记录详情', dr: '导入', gd: '归档', + + bjgsp: '编辑供试品', + xzgsp: '新增供试品', + lqff: '领取发放', + sqgd: '申请归档', + sqjd: '申请解档案', + sqjy: '申请借阅', + gh: '归还', + jsgsp: '解锁供试品', + sdgsp: '锁定供试品', + tyjjbj: '同意/拒绝编辑', + tyjjxgkc:'同意/拒绝修改库存', + bcsm: '补充说明', + jsffjl: '解锁发放记录', + sdffjl: '锁定发放记录', + bjgsprkjl: '编辑供试品入库记录', + jsgsprkjl: '解锁供试品入库记录', + sdgsprkjl: '锁定供试品入库记录', + xzgsprkjl: '新增供试品入库记录', } + diff --git a/src/views/business/resource/gsp/comps/ffjl/Gd.vue b/src/views/business/resource/gsp/comps/ffjl/Gd.vue index fedab20..72856f5 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Gd.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Gd.vue @@ -118,7 +118,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请归档', + qmyy: this.$t('page.business.resource.gsp.sqgd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/ffjl/Jd.vue b/src/views/business/resource/gsp/comps/ffjl/Jd.vue index 2011690..83df232 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jd.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jd.vue @@ -106,7 +106,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请解档', + qmyy: this.$t('page.business.resource.gsp.sqjd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue index 0b5e790..a3f1bff 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jq.vue @@ -96,7 +96,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '补充说明', + qmyy: this.$t('page.business.resource.gsp.bcsm'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/ffjl/Js.vue b/src/views/business/resource/gsp/comps/ffjl/Js.vue index 7d970cd..0c793ea 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Js.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Js.vue @@ -96,7 +96,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '解锁发放记录', + qmyy: this.$t('page.business.resource.gsp.jsffjl'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/ffjl/Jy.vue b/src/views/business/resource/gsp/comps/ffjl/Jy.vue index d9cd7fe..e18d1a2 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jy.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jy.vue @@ -129,7 +129,7 @@ export default { startDate: null, endDate: null, bh: null, - qmyy: '申请借阅', + qmyy: this.$t('page.business.resource.gsp.sqjy'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/ffjl/Sd.vue b/src/views/business/resource/gsp/comps/ffjl/Sd.vue index 37749b9..2e82d3d 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Sd.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Sd.vue @@ -118,7 +118,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '锁定发放记录', + qmyy: this.$t('page.business.resource.gsp.sdffjl'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue index ce41131..f719514 100644 --- a/src/views/business/resource/gsp/comps/gsp/Bj.vue +++ b/src/views/business/resource/gsp/comps/gsp/Bj.vue @@ -190,7 +190,7 @@ export default { }, reset() { this.form = { - qmyy: '编辑', + qmyy: this.$t('page.business.resource.gsp.bjgsp'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue index 6a792ad..eeba9d4 100644 --- a/src/views/business/resource/gsp/comps/gsp/Cz.vue +++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue @@ -128,7 +128,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '处置', + qmyy: this.$t('page.business.resource.gsp.cz'), kcdw: '', qmrmm: null } diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue index bdea640..b5f27bb 100644 --- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue +++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue @@ -136,7 +136,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '处置', + qmyy: this.$t('page.business.resource.gsp.cz'), kcdw: '', qmrmm: null } diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue index b57568e..728290f 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue @@ -364,7 +364,7 @@ export default { ffr2Id: null, ffr2mm: null, xmId: null, - qmyy: '领取发放', + qmyy: this.$t('page.business.resource.gsp.lqff'), qmrmm: null, remark: null } diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue index 53c26d0..0d9b264 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Gd.vue @@ -94,7 +94,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请归档', + qmyy: this.$t('page.business.resource.gsp.sqgd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue index e8d744a..4b0e482 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gh.vue +++ b/src/views/business/resource/gsp/comps/gsp/Gh.vue @@ -262,7 +262,7 @@ export default { jsr1mm: null, jsr2Id: null, jsr2mm: null, - qmyy: '归还', + qmyy: this.$t('page.business.resource.gsp.gh'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gsp/comps/gsp/Jd.vue b/src/views/business/resource/gsp/comps/gsp/Jd.vue index 772919f..2315622 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Jd.vue @@ -119,7 +119,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请解档', + qmyy: this.$t('page.business.resource.gsp.sqjd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue index 7dd24d5..28bb847 100644 --- a/src/views/business/resource/gsp/comps/gsp/Js.vue +++ b/src/views/business/resource/gsp/comps/gsp/Js.vue @@ -98,7 +98,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '解锁供试品', + qmyy: this.$t('page.business.resource.gsp.jsgsp'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue index 32e6f1f..9cac9ff 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jy.vue +++ b/src/views/business/resource/gsp/comps/gsp/Jy.vue @@ -153,7 +153,7 @@ export default { bh: null, startDate: null, endDate: null, - qmyy: '申请借阅', + qmyy: this.$t('page.business.resource.gsp.sqjy'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue index 9f0adca..c822ad8 100644 --- a/src/views/business/resource/gsp/comps/gsp/Sd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Sd.vue @@ -93,7 +93,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '锁定供试品', + qmyy: this.$t('page.business.resource.gsp.sdgsp'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Shbj.vue b/src/views/business/resource/gsp/comps/gsp/Shbj.vue index eb12c0f..d148517 100644 --- a/src/views/business/resource/gsp/comps/gsp/Shbj.vue +++ b/src/views/business/resource/gsp/comps/gsp/Shbj.vue @@ -58,10 +58,7 @@ - - - - + @@ -89,8 +86,8 @@
- {{ $t('form.confirm') }} - {{ $t('form.cancel') }} + {{ $t('form.reject') }} + {{ $t('form.approve') }}
@@ -144,7 +141,8 @@ export default { qmrmm: null, bjrMc: null, bjbz: null, - qmyy: 10, + qmyy: null, + qmyyMc: this.$t('page.business.resource.gsp.tyjjbj'), remark: '' } this.resetForm("form") @@ -167,12 +165,17 @@ export default { this.$modal.closeLoading() }) }, - save() { + save(qmyy) { this.$refs["form"].validate(valid => { if (valid) { + this.$modal.loading() + this.form.qmyy=qmyy shbj(this.form).then(response => { this.open = false + this.$modal.closeLoading() this.$emit('callback') + }).finally(() => { + this.$modal.closeLoading() }) } }) diff --git a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue index 25d10a4..a718f4e 100644 --- a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue @@ -48,10 +48,7 @@ - - - - + @@ -79,8 +76,8 @@
- {{ $t('form.confirm') }} - {{ $t('form.cancel') }} + {{ $t('form.reject') }} + {{ $t('form.approve') }}
@@ -143,7 +140,8 @@ export default { qmrmm: null, kcbjrMc: null, kcbjbz: null, - qmyy: 10, + qmyy: null, + qmyyMc: this.$t('page.business.resource.gsp.tyjjxgkc'), remark: '' } this.resetForm("form") @@ -165,12 +163,17 @@ export default { this.$modal.closeLoading() }) }, - save() { + save(qmyy) { this.$refs["form"].validate(valid => { if (valid) { + this.$modal.loading() + this.form.qmyy=qmyy shxgkc(this.form).then(response => { this.open = false this.$emit('callback') + this.$modal.closeLoading() + }).finally(() => { + this.$modal.closeLoading() }) } }) diff --git a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue index aff07e1..a82aa8f 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue @@ -108,7 +108,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '修改库存', + qmyy: this.$t('page.business.resource.gsp.xgkc'), sdrmm: null, kc: '', kcdw: '', diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue index 06abd7a..f127f51 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xz.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue @@ -209,7 +209,7 @@ export default { cctj: null, ccwz: null, qmrmm: null, - qmyy: '新增供试品', + qmyy: this.$t('page.business.resource.gsp.xzgsp'), bjbz: '' } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue index 6be1e72..29e3139 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue @@ -91,7 +91,7 @@ - @@ -186,7 +186,7 @@ export default { reset() { this.form = { ids: null, - qmyy: '钥匙发放', + qmyy: this.$t('page.business.resource.gsp.ysff'), zcgId: null, qmrmm: null, remark: null, diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue index 85d7cb7..7542f49 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue @@ -180,7 +180,7 @@ export default { }, reset() { this.form = { - qmyy: '编辑供试品入库记录', + qmyy: this.$t('page.business.resource.gsp.bjgsprkjl'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gsp/comps/rkjl/Gd.vue b/src/views/business/resource/gsp/comps/rkjl/Gd.vue index 31f4eeb..7f54d34 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Gd.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Gd.vue @@ -118,7 +118,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请归档', + qmyy: this.$t('page.business.resource.gsp.sqgd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/rkjl/Jd.vue b/src/views/business/resource/gsp/comps/rkjl/Jd.vue index e393456..5437608 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Jd.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Jd.vue @@ -106,7 +106,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请解档', + qmyy: this.$t('page.business.resource.gsp.sqjd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/rkjl/Js.vue b/src/views/business/resource/gsp/comps/rkjl/Js.vue index 8a5577f..46a8ca3 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Js.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Js.vue @@ -96,7 +96,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '解锁发放记录', + qmyy: this.$t('page.business.resource.gsp.jsgsprkjl'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/rkjl/Jy.vue b/src/views/business/resource/gsp/comps/rkjl/Jy.vue index 63893f6..40171b3 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Jy.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Jy.vue @@ -129,7 +129,7 @@ export default { startDate: null, endDate: null, bh: null, - qmyy: '申请借阅', + qmyy: this.$t('page.business.resource.gsp.sqjy'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/rkjl/Sd.vue b/src/views/business/resource/gsp/comps/rkjl/Sd.vue index 4f15b9a..b95d0f1 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Sd.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Sd.vue @@ -118,7 +118,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '锁定发放记录', + qmyy: this.$t('page.business.resource.gsp.sdgsprkjl'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue index ebe6c27..09c6829 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue @@ -194,7 +194,7 @@ export default { cctj: null, ccwz: null, qmrmm: null, - qmyy: '新增供试品入库记录', + qmyy: this.$t('page.business.resource.gsp.xzgsprkjl'), bjbz: '' } this.resetForm("form") From dc6ffcfbacd4bea46437977aeeb3b677af1e9879 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 15 Jan 2026 14:22:24 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E9=80=89=E6=8B=A9=E5=AE=A1=E6=A0=B8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user.js | 13 ++- .../business/comps/select/SelectStudyUser.vue | 116 +++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 src/views/business/comps/select/SelectStudyUser.vue diff --git a/src/api/system/user.js b/src/api/system/user.js index 384c7fc..8099872 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -145,9 +145,18 @@ export function checkStatus(query) { } // 查询部门+用户列表 -export function deptUserList() { +export function deptUserList(query) { return request({ url: '/system/user/deptUserList', - method: 'get' + method: 'get', + params: query + }) +} +// 查询试验下用户列表 +export function studyUser(query) { + return request({ + url: '/system/user/studyUser', + method: 'get', + params: query }) } diff --git a/src/views/business/comps/select/SelectStudyUser.vue b/src/views/business/comps/select/SelectStudyUser.vue new file mode 100644 index 0000000..dd10254 --- /dev/null +++ b/src/views/business/comps/select/SelectStudyUser.vue @@ -0,0 +1,116 @@ + + + From 5bee0269cd62dd6bfcaad9ad052c6296b43b5203 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 15 Jan 2026 14:48:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=A1=A8=E5=8D=95=E7=BF=BB=E8=AF=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/resource/gyzj.js | 226 ++++++++++---------- src/lang/en/business/resource/mjy.js | 230 +++++++++++---------- src/lang/en/business/resource/zcg.js | 55 +++-- src/lang/en/business/study/studyFormApply.js | 92 ++++----- src/lang/en/business/study/studyFormFill.js | 114 +++++----- src/lang/en/business/study/studyFormPlan.js | 88 ++++---- src/lang/en/business/study/studyFormPre.js | 53 +++-- src/lang/zh/business/resource/gyzj.js | 4 + src/lang/zh/business/resource/mjy.js | 5 +- src/lang/zh/business/resource/zcg.js | 3 +- src/lang/zh/business/study/studyFormFill.js | 1 - .../business/resource/gyzj/comps/gyzj/Czrq.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Czyj.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Ysff.vue | 5 - src/views/business/resource/mjy/comps/mjy/Czrq.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Czyj.vue | 2 +- src/views/business/resource/zcg/list.vue | 2 +- 17 files changed, 444 insertions(+), 442 deletions(-) diff --git a/src/lang/en/business/resource/gyzj.js b/src/lang/en/business/resource/gyzj.js index 1705e99..08d67f5 100644 --- a/src/lang/en/business/resource/gyzj.js +++ b/src/lang/en/business/resource/gyzj.js @@ -1,119 +1,123 @@ export default { - mc: '名称', - bh: '编号', - jyzt: '借阅状态', - zjzt: '制剂状态', - jlzt: '记录状态', - sxrq: '失效日期', - nd: '浓度', - nddw: '浓度单位', - kcl: '库存量', - kc: '库存', - kcdw: '库存单位', - zcg: '暂存柜', - cctj: '存储条件', - ccwz: '存储位置', - cksj: '出库时间', - rksj: '入库时间', - ckjz: '出库量', - rkjz: '入库量', - syl: '使用量', - lqr1: '领取人', - lqr2: '领取人2', - yslqr1: '钥匙1领取人', - yslqr2: '钥匙2领取人', - kgy1: '库管员', - kgy2: '库管员2', - rkmz: '入库毛重', - plff: '批量发放', - plczyj: '批量处置药剂', - plczrq: '批量处置容器', - ysff: '钥匙发放', - plsd: '批量锁定', - plgd: '批量归档', - lock: '锁定', - unlock: '解锁', - detail: '详情', - guidang: '归档', - jiedang: '解档', - jieyue: '借阅', - guihuan: '确认归还', - fafang: '发放', - czrq: '处置容器', - czyj: '处置药剂', - yuanyin: '原因', - xgkc: '修改库存', - shxgkc: '审核修改库存', - shbj: '审核编辑', - clr: '处理人', - czfs: '处置方式', - fhr: '复核人', - xgbz: '修改备注', - jdr: '监督人', - xgr: '修改人', - czl: '处置量', - ffr: '发放人', - ffr1: '发放人', - ffr2: '发放人2', - zytj: '转移条件', + mc: 'Name', + bh: 'ID', + jyzt: 'Check-out Status', + zjzt: 'Status', + jlzt: 'Status', + sxrq: 'Expiration', + nd: 'Concentration', + nddw: 'Concentration Unit', + kcl: 'Amount', + kc: 'Inventory', + kcdw: 'Inventory Unit', + zcg: 'Locker', + cctj: 'Storage Condition', + ccwz: 'Storage Location', + cksj: 'Out of Storage Date', + rksj: 'Into Storage Date', + ckjz: 'Check-out Net Weight', + rkjz: 'Check-in Net Weight', + syl: 'Usage Amount', + lqr1: 'Recipient', + lqr2: 'Recipient 2', + yslqr1: 'Key 1 User', + yslqr2: 'Key 2 User', + kgy1: 'Warehouse Keeper', + kgy2: 'Warehouse Keeper 2', + rkmz: 'Check-in Gross Weight', + plff: 'Batch Distribution', + plczyj: 'Batch Dispose Substance', + plczrq: 'Batch Dispose Containers', + plczyjt: 'Substance Batch Disposal', + plczrqt: 'Containers Batch Disposal', + ysff: 'Issue Key', + plsd: 'Batch Lock', + plgd: 'Batch Archive', + lock: 'Lock', + unlock: 'Unlock', + detail: 'Detail', + guidang: 'Archive', + jiedang: 'De-archive', + jieyue: 'Check out', + guihuan: 'Confirm Check-in', + fafang: 'Distribution', + czrq: 'Dispose Container', + czyj: 'Dispose Substance', + czrqt: 'Container Disposal', + czyjt: 'Substance Disposal', + yuanyin: 'Reason', + xgkc: 'Change Inventory', + shxgkc: 'Approve Inventory Change', + shbj: 'Approve Edit', + clr: 'Operator', + czfs: 'Dispose Method', + fhr: 'Reviewer', + xgbz: 'Edit Comment', + jdr: 'Supervisor', + xgr: 'Editor', + czl: 'Amount', + ffr: 'Issuer', + ffr1: 'Issuer 1', + ffr2: 'Issuer 2', + zytj: 'Transfer Condition', md: '目的', - ckl: '出库量', - ckldw: '出库单位', - ffzytj: '发放转移条件', - ghzytj: '归还转移条件', - ys1lrq: '钥匙1领取人', - ys2lrq: '钥匙2领取人', - sssy: '所属试验', - ssbd: '所属表单', - bdssr: '表单所属人', - syr: '使用人', - lqghr: '领取/归还人', - ffjsr: '发放/接收人', - czlx: '操作类型', - czl: '操作量', - bzyy: '备注/原因', - ccsj: '操作时间', - cksj: '出库时间', - rksj: '入库时间', - jiaqian: '加签', - gyzjgl: '给药制剂管理', - ffhsjl: '发放回收记录', - bdxx: '表单信息', - jbxx: '基本信息', - rkwz: '入库位置', - rktj: '入库条件', - zytj: '转移条件', - rkl: '入库净重', - ghr1Id: '归还人', - ghr2Id: '归还人2', - jsr1Id: '接收人', - jsr2Id: '接收人2', - tz: '给药制剂台账', + ckl: 'Out Amount', + ffzytj: 'Check-out Transfer Condition', + ghzytj: 'Check-in Transfer Condition', + ckmzdw: 'Check-out Gross Weight Unit', + ys1lrq: 'Key 1 Recipient', + ys2lrq: 'Key 2 Recipient', + sssy: 'From Study', + ssbd: 'In Record', + bdssr: 'By User', + syr: 'User', + lqghr: 'Recipient/Returner', + ffjsr: 'Issuer/Receiver', + czlx: 'Action', + czl: 'Amount', + bzyy: 'Comment/Reason', + ccsj: 'Datetime', + cksj: 'Out of Storage Date', + rksj: 'Into Storage Date', + jiaqian: 'Sign', + gyzjgl: 'Dose Formulation', + ffhsjl: 'In-and-Out Record', + bdxx: 'Record Information', + jbxx: 'Information', + rkwz: 'Check-in Location', + rktj: 'Check-in Condition', + zytj: 'Transfer Condition', + rkl: 'Check-in Net Weight', + ghr1Id: 'Returner', + ghr2Id: 'Returner 2', + jsr1Id: 'Warehouse Keeper', + jsr2Id: 'Warehouse Keeper 2', + tz: 'Dose Table', gdsqrId: '归档申请人', - lqsj: '领取时间', - jcgj: '稽查轨迹', - ffbz: '发放备注', - ghbz: '归还备注', - cjsj: '创建时间', - jysj: '借阅时间', - ffjlxq: '发放回收记录详情', - gyzjxq: '给药制剂详情', - sqguihuan: '归还', + lqsj: 'Time of Transfer', + jcgj: 'Track Record', + ffbz: 'Check-out Comment', + ghbz: 'Check-in Comment', + cjsj: 'Creation Date', + jysj: 'Checkout Period', + ffjlxq: 'In-and-Out Record Information', + gyzjxq: 'Dose Information', + sqguihuan: 'Return', qrrk: '确认入库', - qmr1Id: '签名人1', - qmr2Id: '签名人2', - lqff: '领取发放', - sqgd: '申请归档', - sqjd: '申请解档', - jsgyzj: '解锁给药制剂', - sqjy: '申请借阅', - tyjjrk: '同意/拒绝入库', - sdgyzj: '锁定给药制剂', - tyjjbj: '同意/拒绝编辑', - tyjjxgkc: '同意/拒绝修改库存', + qmr1Id: 'Signed By 1', + qmr2Id: 'Signed By 2', + lqff: 'Distribution', + sqgd: 'Apply for Archiving', + sqjd: 'Apply for De-archiving', + jsgyzj: 'Unlock Dose', + sqjy: 'Apply for Check-out', + tyjjrk: 'Approve/Reject In Storage', + sdgyzj: 'Lock Dose', + tyjjbj:'Approve/Reject Edit', + tyjjxgkc:'Approve/Reject Change Inventory', gyzjrk: '给药制剂入库', - ruku: '入库', - xgkc: '修改库存', + ruku: 'In Storage', + xgkc: 'Change Inventory', bcsm: '补充说明', jsffjl: '解锁发放记录', sdffjl: '锁定发放记录' diff --git a/src/lang/en/business/resource/mjy.js b/src/lang/en/business/resource/mjy.js index d43cd7a..4ef6c88 100644 --- a/src/lang/en/business/resource/mjy.js +++ b/src/lang/en/business/resource/mjy.js @@ -1,122 +1,124 @@ export default { - mc: '名称', - bh: '编号', - jyzt: '借阅状态', - zjzt: '制剂状态', - jlzt: '记录状态', - sxrq: '失效日期', - nd: '浓度', - nddw: '浓度单位', - kcl: '库存量', - kc: '库存', - kcdw: '库存单位', - zcg: '暂存柜', - cctj: '存储条件', - ccwz: '存储位置', - cksj: '出库时间', - rksj: '入库时间', - ckjz: '出库净重', - rkjz: '入库净重', - syl: '使用量', - lqr1: '领取人', - lqr2: '领取人2', - yslqr1: '钥匙1领取人', - yslqr2: '钥匙2领取人', - kgy1: '库管员', - kgy2: '库管员2', - plff: '批量发放', - plczyj: '批量处置药剂', - plczrq: '批量处置容器', - ysff: '钥匙发放', - plsd: '批量锁定', - plgd: '批量归档', - lock: '锁定', - unlock: '解锁', - detail: '详情', - guidang: '归档', - jiedang: '解档', - jieyue: '借阅', - guihuan: '归还', - fafang: '发放', - czrq: '处置容器', - czyj: '处置药剂', - yuanyin: '原因', - xgkc: '修改库存', - shxgkc: '审核修改库存', - shbj: '审核编辑', - clr: '处理人', - czfs: '处置方式', - fhr: '复核人', - xgbz: '修改备注', - jdr: '监督人', - xgr: '修改人', - czl: '处置量', - ffr: '发放人', - ffr1: '发放人1', - ffr2: '发放人2', - zytj: '转移条件', + mc: 'Name', + bh: 'ID', + jyzt: 'Check-out Status', + zjzt: 'Status', + jlzt: 'Status', + sxrq: 'Expiration', + nd: 'Concentration', + nddw: 'Concentration Unit', + kcl: 'Amount', + kc: 'Inventory', + kcdw: 'Inventory Unit', + zcg: 'Locker', + cctj: 'Storage Condition', + ccwz: 'Storage Location', + cksj: 'Out of Storage Date', + rksj: 'Into Storage Date', + ckjz: 'Check-out Net Weight', + rkjz: 'Check-in Net Weight', + syl: 'Usage Amount', + lqr1: 'Recipient', + lqr2: 'Recipient 2', + yslqr1: 'Key 1 User', + yslqr2: 'Key 2 User', + kgy1: 'Warehouse Keeper', + kgy2: 'Warehouse Keeper 2', + plff: 'Batch Distribution', + plczyj: 'Batch Dispose Substance', + plczrq: 'Batch Dispose Containers', + plczyjt: 'Substance Batch Disposal', + plczrqt: 'Containers Batch Disposal', + ysff: 'Issue Key', + plsd: 'Batch Lock', + plgd: 'Batch Archive', + lock: 'Lock', + unlock: 'Unlock', + detail: 'Detail', + guidang: 'Archive', + jiedang: 'De-archive', + jieyue: 'Check out', + guihuan: 'Return', + fafang: 'Distribution', + czrq: 'Dispose Container', + czyj: 'Dispose Substance', + czrqt: 'Container Disposal', + czyjt: 'Substance Disposal', + yuanyin: 'Reason', + xgkc: 'Change Inventory', + shxgkc: 'Approve Inventory Change', + shbj: 'Approve Edit', + clr: 'Operator', + czfs: 'Dispose Method', + fhr: 'Reviewer', + xgbz: 'Edit Comment', + jdr: 'Supervisor', + xgr: 'Editor', + czl: 'Amount', + ffr: 'Issuer', + ffr1: 'Issuer 1', + ffr2: 'Issuer 2', + zytj: 'Transfer Condition', md: '目的', - ckmz: '出库毛重', - ckl: '出库量', - ckldw: '出库单位', - ffzytj: '发放转移条件', - ghzytj: '归还转移条件', - ckmz: '出库毛重', - ckmzdw: '出库毛重单位', - ys1lrq: '钥匙1领取人', - ys2lrq: '钥匙2领取人', - sssy: '所属试验', - ssbd: '所属表单', - bdssr: '表单所属人', - syr: '使用人', - lqghr: '领取/归还人', - ffjsr: '发放/接收人', - czlx: '操作类型', - czl: '操作量', - bzyy: '备注/原因', - ccsj: '操作时间', - cksj: '出库时间', - rksj: '入库时间', - jiaqian: '加签', - mjygl: '麻精药管理', - ffhsjl: '发放回收记录', - ruku: '入库', - bdxx: '表单信息', - jbxx: '基本信息', - rkwz: '入库位置', - rktj: '入库条件', - zytj: '转移条件', - rkmz: '入库毛重', + ckmz: 'Check-out Gross Weight', + ckl: 'Out Amount', + ffzytj: 'Check-out Transfer Condition', + ghzytj: 'Check-in Transfer Condition', + ckmzdw: 'Check-out Gross Weight Unit', + ys1lrq: 'Key 1 Recipient', + ys2lrq: 'Key 2 Recipient', + sssy: 'From Study', + ssbd: 'In Record', + bdssr: 'By User', + syr: 'User', + lqghr: 'Recipient/Returner', + ffjsr: 'Issuer/Receiver', + czlx: 'Action', + czl: 'Amount', + bzyy: 'Comment/Reason', + ccsj: 'Datetime', + cksj: 'Out of Storage Date', + rksj: 'Into Storage Date', + jiaqian: 'Sign', + mjygl: 'Controlled Drug', + ffhsjl: 'In-and-Out Record', + ruku: 'Into Storage', + bdxx: 'Record Information', + jbxx: 'Information', + rkwz: 'Check-in Location', + rktj: 'Check-in Condition', + zytj: 'Transfer Condition', + rkmz: 'Check-in Gross Weight', jsl: '减少量', - syl: '使用量', - ghr1Id: '归还人', - ghr2Id: '归还人2', - jsr1Id: '库管员', - jsr2Id: '库管员2', - tz: '麻精药台账', - lqsj: '领取时间', - jcgj: '稽查轨迹', - ffbz: '发放备注', - ghbz: '归还备注', - cjsj: '创建时间', - rkl: '入库毛重', - jysj: '借阅时间', - mjyxq: '麻精药详情', - ffjlxq: '发放回收记录详情', + syl: 'Usage Amount', + ghr1Id: 'Returner', + ghr2Id: 'Returner 2', + jsr1Id: 'Warehouse Keeper', + jsr2Id: 'Warehouse Keeper 2', + tz: 'Drug Table', + lqsj: 'Time of Transfer', + jcgj: 'Track Record', + ffbz: 'Check-out Comment', + ghbz: 'Check-in Comment', + cjsj: 'Creation Date', + rkl: 'Check-in Gross Weight', + jysj: 'Checkout Period', + mjyxq: 'Drug Information', + ffjlxq: 'In-and-Out Record Information', sswjj:'所属文件夹', - ssbd:'所属表单', - qmr1Id:'签名人1', - qmr2Id:'签名人2', - lqff:'领取发放', - sqgd:'申请归档', - sqjd:'申请解档', - jsmjy:'解锁麻精药', - sqjy:'申请借阅', + ssbd:'In Record', + qmr1Id:'Signed By 1', + qmr2Id:'Signed By 2', + lqff:'Distribution', + sqgd:'Apply for Archiving', + sqjd:'Apply for De-archiving', + jsmjy:'Unlock Drug', + sqjy:'Apply for Check-out', mjyrk:'麻精药入库', - sdmjy:'锁定麻精药', - tyjjbj:'同意/拒绝编辑', - tyjjxgkc:'同意/拒绝修改库存', - xgkc:'修改库存', + sdmjy:'Lock Drug', + tyjjbj:'Approve/Reject Edit', + tyjjxgkc:'Approve/Reject Change Inventory', + xgkc:'Change Inventory', bcsm:'补充说明', jsffjl:'解锁发放记录', sdffjl:'锁定发放记录' diff --git a/src/lang/en/business/resource/zcg.js b/src/lang/en/business/resource/zcg.js index 3b1579e..e857632 100644 --- a/src/lang/en/business/resource/zcg.js +++ b/src/lang/en/business/resource/zcg.js @@ -1,33 +1,32 @@ export default { - ysbh: '钥匙编号', - jyr: '借用人', - zt: '状态', - jyz: '借用中', - wjy: '未借用', - plgh: '批量归还', - zcg: '暂存柜', - ysbh: '钥匙编号', - ys1jyr: '钥匙1借用人', - ys2jyr: '钥匙2借用人', - glyj: '关联药剂', - ysff: '发放钥匙', - gh: '归还', - ysgh: '钥匙归还', + ysbh: 'Locker', + jyr: 'Key User', + zt: 'Status', + jyz: 'In Use', + wjy: 'Not in Use', + plgh: 'Batch Return', + zcg: 'Locker', + ys1jyr: 'Key 1 User', + ys2jyr: 'Key 2 User', + glyj: 'Contained Substance', + ysff: 'Issue Key', + gh: 'Return', + ysgh: 'Return Key', ysghts:'请确认是否归还以下钥匙', - ghr1Id:'钥匙1归还人', - ghr1mm:'钥匙1归还人密码', - ghr2Id:'钥匙2归还人', - ghr2mm:'钥匙2归还人密码', + ghr1Id:'Key 1 Returner', + ghr1mm:'Key 1 Returner Password', + ghr2Id:'Key 2 Returner', + ghr2mm:'Key 2 Returner Password', jsr:'接收人', jsrmm:'接收人密码', - qmyy:'签名意义', - remark:'备注', - lqr1Id:'钥匙1领取人', - lqr1mm:'钥匙1领取人密码', - lqr2Id:'钥匙2领取人', - lqr2mm:'钥匙2领取人密码', - ffr:'发放人', - ffrmm:'发放人密码', - qysff:'钥匙发放', - qysgh:'钥匙归还' + qmyy:'Purpose', + remark:'Comment', + lqr1Id:'Key 1 Recipient', + lqr1mm:'Key 1 Recipient Password', + lqr2Id:'Key 2 Recipient', + lqr2mm:'Key 2 Recipient Password', + ffr:'Issuer', + ffrmm:'Issuer Password', + qysff:'Key Distribution', + qysgh:'Return Key' } \ No newline at end of file diff --git a/src/lang/en/business/study/studyFormApply.js b/src/lang/en/business/study/studyFormApply.js index 3f2c577..6c398f6 100644 --- a/src/lang/en/business/study/studyFormApply.js +++ b/src/lang/en/business/study/studyFormApply.js @@ -1,60 +1,60 @@ export default { - jcsz: '基础设置', + jcsz: 'Setup', bdtb: '表单填报', - xzbd: '新增表单', - fh: '复核', - jq: '加签', - ghgsr: '更换归属人', - sy: '审阅', - fz: '废止', - qrfz: '确认废止', - gc: '观察', - bdsm: '表单说明', - zc: '暂存', - next: '下一步', - pre: '上一步', - save: '保存', - submit: '提交', + xzbd: 'Create', + fh: 'QC', + jq: 'Sign', + ghgsr: 'Change Owner', + sy: 'Review', + fz: 'Abandon', + qrfz: 'Confirm', + gc: 'View', + bdsm: 'Description', + zc: 'Save', + next: 'Next', + pre: 'Pre', + save: 'Save', + submit: 'Submit', bdnr: '表单内容', qmxx: '签名信息', - qmr: '签名人', - qmyy: '签名意义', - qmsj: '签名时间', - bzyy: '备注原因', - jcgj: '稽查轨迹', - cjjl: '创建记录', + qmr: 'Signed By', + qmyy: 'Purpose', + qmsj: 'Date', + bzyy: 'Comment/Reason', + jcgj: 'Track Record', + cjjl: 'Create', sfbl: '是否为补录', - yes: '是', - no: '否', + yes: 'Yes', + no: 'No', tjjl: '提交记录', sqfz: '申请废止', - dcqbjcgj: '导出(全部稽查轨迹)', - dclcjcgj: '导出(流程稽查轨迹)', - dcbjjcgj: '导出(编辑稽查轨迹)', - dcxgjcgj: '导出(修改稽查轨迹)', - dcbhsjgj: '导出(不含数据轨迹)', - tbz: '填报中', - ytj: '已提交', - wtg: '未通过', - yfh: '已复核', - ywc: '已完成', - dfz: '待废止', - yfz: '已废止', - sh: '审核', - guancha: '观察', - jiaqian: '加签', - qrfz: '确认废止', - reject: '拒绝', - reason: '原因', - approve: '通过', - szqk: '生长情况', - rybg: '人员变更', - shenyue: '审阅', + dcqbjcgj: 'Export (All Track Records)', + dclcjcgj: 'Export (Milestone Track Record)', + dcbjjcgj: 'Export (Edit Track Record)', + dcxgjcgj: 'Export (Change Track Record)', + dcbhsjgj: 'Export (Excluding Track Record)', + tbz: 'On-going', + ytj: 'Submitted', + wtg: 'Rejected', + yfh: 'Approved', + ywc: 'Completed', + dfz: 'Pending Abandon', + yfz: 'Abandoned', + sh: 'Approve', + guancha: 'View', + jiaqian: 'Sign', + qrfz: 'Confirm', + reject: 'Reject', + reason: 'Reason', + approve: 'Approve', + szqk: 'Growth Status', + rybg: 'Change of Person', + shenyue: 'Review', fhjj: '复核拒绝', fhtg: '复核通过', shjj: '审核拒绝', shtg: '审核通过', - tongguo: '通过', + tongguo: 'Approve', ksxcfh: '开始现场复核', jsxcfh: '结束现场复核', smxz: '申明协作', diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js index a36b399..45c0d0d 100644 --- a/src/lang/en/business/study/studyFormFill.js +++ b/src/lang/en/business/study/studyFormFill.js @@ -1,77 +1,75 @@ export default { - mc: '名称', - bh: '编号', - syl: '使用量', - cz: '处置', - tjcz: '添加处置', - cc: '存储', - tjcc: '添加存储', - yltj: '用量统计', - jcsz: '基础设置', - bdtb: '表单填报', - xzbd: '新增表单', - fh: '复核', - jq: '加签', - ghgsr: '更换归属人', - sy: '审阅', - fz: '废止', - qrfz: '确认废止', - gc: '观察', - bdsm: '表单说明', - zc: '暂存', - next: '下一步', - pre: '上一步', - save: '保存', - submit: '提交', + mc: 'Name', + bh: 'ID', + syl: 'Usage Amount', + cz: 'Disposal', + tjcz: 'Add Disposal', + cc: 'Storage', + tjcc: 'Add Input for Storage', + yltj: 'Summary of Usage', + jcsz: 'Setup', + bdtb: 'Preset Fill', + xzbd: 'Create', + fh: 'QC', + jq: 'Sign', + ghgsr: 'Change Owner', + sy: 'Review', + fz: 'Abandon', + qrfz: 'Confirm', + gc: 'View', + bdsm: 'Description', + zc: 'Save', + next: 'Next', + pre: 'Pre', + save: 'Save', + submit: 'Submit', bdnr: '表单内容', qmxx: '签名信息', - qmr: '签名人', - qmyy: '签名意义', - qmsj: '签名时间', - bzyy: '备注原因', - jcgj: '稽查轨迹', + qmr: 'Signed By', + qmyy: 'Purpose', + qmsj: 'Date', + bzyy: 'Comment/Reason', + jcgj: 'Track Record', cjjl: '创建记录', sfbl: '是否为补录', - yes: '是', - no: '否', + yes: 'Yes', + no: 'No', tjjl: '提交记录', sqfz: '申请废止', - dcqbjcgj: '导出(全部稽查轨迹)', - dclcjcgj: '导出(流程稽查轨迹)', - dcbjjcgj: '导出(编辑稽查轨迹)', - dcxgjcgj: '导出(修改稽查轨迹)', - dcbhsjgj: '导出(不含数据轨迹)', - ytbd: '预填表单', - tbz: '填报中', - ytj: '已提交', - ywc: '已完成', - ywcfh: '已完成（经复核）', - ywc: '已完成', - dfz: '待废止', - yfz: '已废止', - guancha: '观察', - jiaqian: '加签', - qrfz: '确认废止', - reject: '拒绝', - reason: '原因', - approve: '通过', - szqk: '生长情况', - rybg: '人员变更', - shenyue: '审阅', + dcqbjcgj: 'Export (All Track Records)', + dclcjcgj: 'Export (Milestone Track Record)', + dcbjjcgj: 'Export (Edit Track Record)', + dcxgjcgj: 'Export (Change Track Record)', + dcbhsjgj: 'Export (Excluding Track Record)', + ytbd: 'Preset', + tbz: 'On-going', + ytj: 'Submitted', + ywc: 'Completed', + ywcfh: 'Completed & Approved', + dfz: 'Pending Abandon', + yfz: 'Abandoned', + guancha: 'View', + jiaqian: 'Sign', + qrfz: 'Confirm', + reject: 'Reject', + reason: 'Reason', + approve: 'Approve', + szqk: 'Growth Status', + rybg: 'Change of Person', + shenyue: 'Review', fhjj: '复核拒绝', fhtg: '复核通过', - tongguo: '通过', + tongguo: 'Approve', txbtjjl: '填写并提交记录', zztjyzbd: '制作提交预制表单', mfhtg: '免复核通过', - lianghao: '良好', - zhong: '中', - cha: '差', + lianghao: 'Good', + zhong: 'Average', + cha: 'Bad', ksxcfh: '开始现场复核', jsxcfh: '结束现场复核', smxz: '申明协作', bcsm: '补充说明', fztgjj: '废止通过/拒绝', ysy: '已审阅', - cjjl: '创建记录' } diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js index c22a312..8529a44 100644 --- a/src/lang/en/business/study/studyFormPlan.js +++ b/src/lang/en/business/study/studyFormPlan.js @@ -1,55 +1,55 @@ export default { - jcsz: '基础设置', + jcsz: 'Setup', bdtb: '表单填报', - xzbd: '新增表单', - fh: '复核', - ghgsr: '更换归属人', - sy: '审阅', - gc: '观察', - bdsm: '表单说明', - zc: '暂存', - next: '下一步', - pre: '上一步', - save: '保存', - submit: '提交', + xzbd: 'Create', + fh: 'QC', + ghgsr: 'Change Owner', + sy: 'Review', + gc: 'View', + bdsm: 'Description', + zc: 'Save', + next: 'Next', + pre: 'Pre', + save: 'Save', + submit: 'Submit', bdnr: '表单内容', qmxx: '签名信息', - qmr: '签名人', - qmyy: '签名意义', - qmsj: '签名时间', - bzyy: '备注原因', - jcgj: '稽查轨迹', - cjjl: '创建记录', - xzpzjhb: '新增配置计划表', - yes: '是', + qmr: 'Signed By', + qmyy: 'Purpose', + qmsj: 'Date', + bzyy: 'Comment/Reason', + jcgj: 'Track Record', + cjjl: 'Create', + xzpzjhb: 'Create', + yes: 'Yes', + no: 'No', shryId: '复核人员', - no: '否', tjjl: '提交记录', - dcqbjcgj: '导出(全部稽查轨迹)', - dclcjcgj: '导出(流程稽查轨迹)', - dcbjjcgj: '导出(编辑稽查轨迹)', - dcxgjcgj: '导出(修改稽查轨迹)', - dcbhsjgj: '导出(不含数据轨迹)', - rybg: '人员变更', - tbz: '填报中', - ytj: '已提交', - ywcfh: '已完成（经复核）', - ywc: '已完成', - reject: '拒绝', - reason: '原因', - approve: '通过', - shenyue: '审阅', + dcqbjcgj: 'Export (All Track Records)', + dclcjcgj: 'Export (Milestone Track Record)', + dcbjjcgj: 'Export (Edit Track Record)', + dcxgjcgj: 'Export (Change Track Record)', + dcbhsjgj: 'Export (Excluding Track Record)', + rybg: 'Change of Person', + tbz: 'On-going', + ytj: 'Submitted', + ywcfh: 'Completed & Approved', + ywc: 'Completed', + reject: 'Reject', + reason: 'Reason', + approve: 'Approve', + shenyue: 'Review', fhjj: '复核拒绝', fhtg: '复核通过', - tongguo: '通过', - syxx: '试验信息', - symc: '试验名称', - sybh: '试验编号', - syfzr: '试验负责人', - cjsj: '创建时间', - sdsy: '锁定试验', + tongguo: 'Approve', + syxx: 'Information', + symc: 'Study Name', + sybh: 'Study Number', + syfzr: 'Study Director', + cjsj: 'Creation Date', + sdsy: 'Lock Study', syjj: '试验简介', - xz: '新增配置计划表', - syxkxx: '试验学科信息', + xz: 'Create', + syxkxx: 'Discipline', ysy: '已审阅' } diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js index 02e8853..3e98fc9 100644 --- a/src/lang/en/business/study/studyFormPre.js +++ b/src/lang/en/business/study/studyFormPre.js @@ -1,40 +1,39 @@ export default { - jcsz: '基础设置', - bdsj: '表单设计', - xzbd: '新增表单', - zc: '暂存', - next: '下一步', - pre: '上一步', - save: '保存', - submit: '提交', - bdsm: '表单说明', + jcsz: 'Setup', + bdsj: 'Preset Design', + xzbd: 'Create', + zc: 'Save', + next: 'Next', + pre: 'Pre', + save: 'Save', + submit: 'Submit', + bdsm: 'Description', tjysb: '提交预设表', shryId: '审核人员', fzrsh: '是否需要试验负责人审核', - approve: '通过', - reject: '拒绝', - reject: '拒绝', + approve: 'Approve', + reject: 'Reject', shtg: '审核通过', shjj: '审核拒绝', tb: '填报', bdnr: '表单内容', qmxx: '签名信息', - qmr: '签名人', - qmyy: '签名意义', - qmsj: '签名时间', - bzyy: '备注原因', - jcgj: '稽查轨迹', - cjjl: '创建记录', - xjbd: '新建表单', + qmr: 'Signed By', + qmyy: 'Purpose', + qmsj: 'Date', + bzyy: 'Comment/Reason', + jcgj: 'Track Record', + cjjl: 'Create', + xjbd: 'Create', fzbdxz: '复制表单选择', - sssyfsy: '所属试验/非试验', - fzbd: '复制表单', - fzbj: '复制编辑', - yulan: '预览', + sssyfsy: 'From Study/Non-study', + fzbd: 'Copy Preset', + fzbj: 'Copy and Edit', + yulan: 'Preview', ts: '是否确定用该预填模板进行实际填报？', - cjxbd: '创建新表单', - fzyybd: '复制已有表单', - yes: '是', - no: '否', + cjxbd: 'Create Preset', + fzyybd: 'Copy Existing Preset', + yes: 'Yes', + no: 'No', zztjyzbd: '制作提交预制表单' } diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js index 1705e99..a0da737 100644 --- a/src/lang/zh/business/resource/gyzj.js +++ b/src/lang/zh/business/resource/gyzj.js @@ -28,6 +28,8 @@ export default { plff: '批量发放', plczyj: '批量处置药剂', plczrq: '批量处置容器', + plczyjt: '批量处置药剂', + plczrqt: '批量处置容器', ysff: '钥匙发放', plsd: '批量锁定', plgd: '批量归档', @@ -41,6 +43,8 @@ export default { fafang: '发放', czrq: '处置容器', czyj: '处置药剂', + czrqt: '处置容器', + czyjt: '处置药剂', yuanyin: '原因', xgkc: '修改库存', shxgkc: '审核修改库存', diff --git a/src/lang/zh/business/resource/mjy.js b/src/lang/zh/business/resource/mjy.js index d43cd7a..4c4af8b 100644 --- a/src/lang/zh/business/resource/mjy.js +++ b/src/lang/zh/business/resource/mjy.js @@ -27,6 +27,8 @@ export default { plff: '批量发放', plczyj: '批量处置药剂', plczrq: '批量处置容器', + plczyjt: '批量处置药剂', + plczrqt: '批量处置容器', ysff: '钥匙发放', plsd: '批量锁定', plgd: '批量归档', @@ -40,6 +42,8 @@ export default { fafang: '发放', czrq: '处置容器', czyj: '处置药剂', + czrqt: '处置容器', + czyjt: '处置药剂', yuanyin: '原因', xgkc: '修改库存', shxgkc: '审核修改库存', @@ -58,7 +62,6 @@ export default { md: '目的', ckmz: '出库毛重', ckl: '出库量', - ckldw: '出库单位', ffzytj: '发放转移条件', ghzytj: '归还转移条件', ckmz: '出库毛重', diff --git a/src/lang/zh/business/resource/zcg.js b/src/lang/zh/business/resource/zcg.js index 3b1579e..70cf628 100644 --- a/src/lang/zh/business/resource/zcg.js +++ b/src/lang/zh/business/resource/zcg.js @@ -1,12 +1,11 @@ export default { - ysbh: '钥匙编号', + ysbh: '暂存柜', jyr: '借用人', zt: '状态', jyz: '借用中', wjy: '未借用', plgh: '批量归还', zcg: '暂存柜', - ysbh: '钥匙编号', ys1jyr: '钥匙1借用人', ys2jyr: '钥匙2借用人', glyj: '关联药剂', diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index a36b399..a373767 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -73,5 +73,4 @@ export default { bcsm: '补充说明', fztgjj: '废止通过/拒绝', ysy: '已审阅', - cjjl: '创建记录' } diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue index fb20025..bae0167 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue @@ -1,7 +1,7 @@