diff --git a/src/lang/en/business/study/drug.js b/src/lang/en/business/study/drug.js index 0861967..7f80ee2 100644 --- a/src/lang/en/business/study/drug.js +++ b/src/lang/en/business/study/drug.js @@ -59,8 +59,10 @@ export default { tyjd: 'Approve De-archiving', jjgd: 'Reject Archiving', tygd: 'Approve Archiving', + tyjy: 'Approve Check-out', + jjjy: 'Reject Check-out', dqzdgh: 'Check-out End on Time', - qrgh: 'Check-out End Confirmation', + qrgh: 'Confirm Check-in', qb: 'All', lc: 'Milestone', @@ -68,5 +70,6 @@ export default { ry: 'User', scsy: 'Remove', - jysj: 'Checkout Period' + jysj: 'Checkout Period', + sqgdsj: 'Archive Application Date' } diff --git a/src/lang/en/business/study/nonTrial.js b/src/lang/en/business/study/nonTrial.js index 0861967..7f80ee2 100644 --- a/src/lang/en/business/study/nonTrial.js +++ b/src/lang/en/business/study/nonTrial.js @@ -59,8 +59,10 @@ export default { tyjd: 'Approve De-archiving', jjgd: 'Reject Archiving', tygd: 'Approve Archiving', + tyjy: 'Approve Check-out', + jjjy: 'Reject Check-out', dqzdgh: 'Check-out End on Time', - qrgh: 'Check-out End Confirmation', + qrgh: 'Confirm Check-in', qb: 'All', lc: 'Milestone', @@ -68,5 +70,6 @@ export default { ry: 'User', scsy: 'Remove', - jysj: 'Checkout Period' + jysj: 'Checkout Period', + sqgdsj: 'Archive Application Date' } diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js index 405e5cf..9e83f86 100644 --- a/src/lang/en/business/study/study.js +++ b/src/lang/en/business/study/study.js @@ -59,8 +59,10 @@ export default { tyjd: 'Approve De-archiving', jjgd: 'Reject Archiving', tygd: 'Approve Archiving', + tyjy: 'Approve Check-out', + jjjy: 'Reject Check-out', dqzdgh: 'Check-out End on Time', - qrgh: 'Check-out End Confirmation', + qrgh: 'Confirm Check-in', qb: 'All', lc: 'Milestone', @@ -72,6 +74,7 @@ export default { jysj: 'Checkout Period', qxzsy: 'Please Select Study', - - other:'Other' + + other: 'Other', + sqgdsj: 'Archive Application Date' } diff --git a/src/lang/zh/business/study/drug.js b/src/lang/zh/business/study/drug.js index 2494336..69c0874 100644 --- a/src/lang/zh/business/study/drug.js +++ b/src/lang/zh/business/study/drug.js @@ -59,6 +59,8 @@ export default { tyjd: '同意解档', jjgd: '拒绝归档', tygd: '同意归档', + tyjy: '同意借阅', + jjjy: '拒绝借阅', dqzdgh: '到期自动归还', qrgh: '确认归还', @@ -69,5 +71,6 @@ export default { xg: '修改', scsy: '删除麻精药文件夹', - jysj: '借阅时间' + jysj: '借阅时间', + sqgdsj: '申请归档时间' } diff --git a/src/lang/zh/business/study/nonTrial.js b/src/lang/zh/business/study/nonTrial.js index 5df9542..7398364 100644 --- a/src/lang/zh/business/study/nonTrial.js +++ b/src/lang/zh/business/study/nonTrial.js @@ -59,6 +59,8 @@ export default { tyjd: '同意解档', jjgd: '拒绝归档', tygd: '同意归档', + tyjy: '同意借阅', + jjjy: '拒绝借阅', dqzdgh: '到期自动归还', qrgh: '确认归还', @@ -69,5 +71,6 @@ export default { xg: '修改', scsy: '删除非试验', - jysj: '借阅时间' + jysj: '借阅时间', + sqgdsj: '申请归档时间' } diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js index 4e1beee..9674d93 100644 --- a/src/lang/zh/business/study/study.js +++ b/src/lang/zh/business/study/study.js @@ -59,6 +59,8 @@ export default { tyjd: '同意解档', jjgd: '拒绝归档', tygd: '同意归档', + tyjy: '同意借阅', + jjjy: '拒绝借阅', dqzdgh: '到期自动归还', qrgh: '确认归还', @@ -72,5 +74,6 @@ export default { jysj: '借阅时间', qxzsy: '请选择试验', - other:'其他' + other: '其他', + sqgdsj: '申请归档时间' } diff --git a/src/views/business/archive/trial/list.vue b/src/views/business/archive/trial/list.vue index 000576c..0e3eeb5 100644 --- a/src/views/business/archive/trial/list.vue +++ b/src/views/business/archive/trial/list.vue @@ -2,18 +2,12 @@