fix：[资源库管理][给药制剂签名]

src/lang/en.js

@@ -74,6 +74,7 @@ export default {
     export: 'Export',
     saveConfirm: 'Confirm',
     confirm: 'Confirm',
+    reject: 'Reject',
     cancel: 'Cancel',
     close: 'Close',
     operate: 'Action',

src/lang/en/business/resource/gyzj.js

@@ -1,107 +1,122 @@
 export default {
-    mc:'Name',
-    bh:'ID',
-    jyzt:'Check-out',
-    zjzt:'Form',
-    jlzt:'Status',
-    sxrq:'Expiration',
-    nd:'Concentration/Purity',
-    nddw:'浓度单位',
-    kcl:'Inventory',
+  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: '转移条件',
+  md: '目的',
+  ckl: '出库量',
+  ckldw: '出库单位',
+  ffzytj: '发放转移条件',
+  ghzytj: '归还转移条件',
+  ys1lrq: '钥匙1领取人',
+  ys2lrq: '钥匙2领取人',
+  sssy: '所属试验',
+  ssbd: '所属表单',
+  bdssr: '表单所属人',
+  syr: '使用人',
+  lqghr: '领取/归还人',
+  ffjsr: '发放/接收人',
+  czlx: '操作类型',
+  czl: '操作量',
+  bzyy: '备注/原因',
+  ccsj: '操作时间',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  jiaqian: '加签',
+  gyzjgl: '给药制剂管理',
+  ffhsjl: '发放回收记录',
 
-    kc:'Inventory',
-    kcdw:'库存单位',
-    zcg:'Locker',
-    cctj:'Storage Condition',
-    ccwz:'Storage Location',
-    cksj:'Out of Storage Date',
-    rksj:'Into Storage Date',
-    ckjz:'出库量',
-    rkjz:'入库量',
-    syl:'Usage Amount',
-    lqr1:'Recipient',
-    lqr2:'Recipient 2',
-    kgy1:'Warehouse Keeper',
-    kgy2:'Warehouse Keeper 2',
+  bdxx: '表单信息',
+  jbxx: '基本信息',
+  rkwz: '入库位置',
+  rktj: '入库条件',
+  zytj: '转移条件',
+  rkl: '入库净重',
+  ghr1Id: '归还人',
+  ghr2Id: '归还人2',
+  jsr1Id: '接收人',
+  jsr2Id: '接收人2',
+  tz: '给药制剂台账',
+  gdsqrId: '归档申请人',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  cjsj: '创建时间',
+  jysj: '借阅时间',
+  ffjlxq: '发放回收记录详情',
+  gyzjxq: '给药制剂详情',
+  sqguihuan: '归还',
+  qrrk: '确认入库',
+  qmr1Id: '签名人1',
+  qmr2Id: '签名人2',
 
-    plff:'Batch Distribution',
-    plczyj:'Batch Dispose Substance',
-    plczrq:'Batch Dispose Containers',
-    plsd:'Batch Lock',
-    plgd:'Batch Archive',
-    lock:'Lock',
-    unlock:'Unlock',
-    detail:'Detail',
-    guidang:'Archive',
-    jiedang:'De-archive',
-    jieyue:'Check-out',
-    guihuan:'Return',
-    fafang:'Distribution',
-    ysff:'Issue Key',
-    czrq:'Dispose Container',
-    czyj:'Dispose Substance',
-    yuanyin:'Reason',
-    xgkc:'Change Inventory',
-    shxgkc:'Approve Inventory Change',
-    shbj:'Approve Edit',
-    clr:'Operator',
-    czfs:'Dispose Method',
-    fhr:'Reviewer',
-    xgbz:'修改备注',
-    jdr:'Supervisor',
-    xgr:'Editor',
-    czl:'Amount',
-    ffr:'Issuer',
-    ffr1:'Issuer',
-    ffr2:'Issuer 2',
-    zytj:'Transfer Condition',
-    md:'Purpose',
-    ckl:'Amount out',
-    ckldw:'出库单位',
-    ffzytj:'发放转移条件',
-    ghzytj:'归还转移条件',
-    ckmz:'出库毛重',
-    ckmzdw:'出库毛重单位',
-    ys1lrq:'Key 1 User',
-    ys2lrq:'Key 2 User',
-    sssy:'In Study',
-    ssbd:'In Record',
-    bdssr:'By User',
-    syr:'使用人',
-    lqghr:'Recipient/Returner',
-    ffjsr:'Issuer/接收人',
-    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',
+  lqff: '领取发放',
+  sqgd: '申请归档',
+  sqjd: '申请解档',
+  jsgyzj: '解锁给药制剂',
+  sqjy: '申请借阅',
+  tyjjrk: '同意/拒绝入库',
+  sdgyzj: '锁定给药制剂',
+  tyjjbj: '同意/拒绝编辑',
+  tyjjxgkc: '同意/拒绝修改库存',
+  gyzjrk: '给药制剂入库',
 
-    bdxx:'Record Information',
-    jbxx:'Information',
-    rkwz:'入库位置',
-    rktj:'入库条件',
-    zytj:'转移条件',
-    rkmz:'入库净量',
-    jsl:'减少量',
-    syl:'Usage Amount',
-    ghr1Id:'Returner',
-    ghr2Id:'Returner 2',
-    jsr1Id:'Warehouse Keeper',
-    jsr2Id:'Warehouse Keeper 2',
-    tz:'台账',
-  gdsqrId:'归档申请人',
-  lqsj:'领取时间',
-    jcgj:'Track Record',
-    ffbz:'发放备注',
-    ghbz:'归还备注',
-    cjsj:'Creation Date',
-    rkl:'入库量',
-    jysj:'Checkout Period',
-    ffjlxq:'In-and-Out Record Detail',
-    gyzjxq:'Dose Formulation Detail',
-    sqguihuan:'Return'
-}
+  xgkc: '修改库存',
+  bcsm: '补充说明',
+  jsffjl: '解锁发放记录',
+  sdffjl: '锁定发放记录'
+}

src/lang/en/business/resource/mjy.js

@@ -1,104 +1,125 @@
 export default {
-    mc:'Name',
-    bh:'ID',
-    jyzt:'Check-out',
-    zjzt:'Form',
-    jlzt:'Status',
-    sxrq:'Expiration',
-    nd:'Concentration/Purity',
-    nddw:'浓度单位',
-    kcl:'Inventory',
-    kc:'Inventory',
-    kcdw:'库存单位',
-    zcg:'Locker',
-    cctj:'Storage Condition',
-    ccwz:'Storage Location',
-    cksj:'Out of Storage Date',
-    rksj:'Into Storage Date',
-    ckjz:'出库净重',
-    rkjz:'入库净重',
-    syl:'Usage Amount',
-    lqr1:'Recipient',
-    lqr2:'Recipient 2',
-    kgy1:'Warehouse Keeper',
-    kgy2:'Warehouse Keeper 2',
+  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:'Batch Distribution',
-    plczyj:'Batch Dispose Substance',
-    plczrq:'Batch Dispose Containers',
-    plsd:'Batch Lock',
-    plgd:'Batch Archive',
-    lock:'Lock',
-    unlock:'Unlock',
-    detail:'Detail',
-    guidang:'Archive',
-    jiedang:'De-archive',
-    jieyue:'Check-out',
-    guihuan:'Return',
-    fafang:'Distribution',
-    ysff:'Issue Key',
-    czrq:'Dispose Container',
-    czyj:'Dispose Substance',
-    yuanyin:'Reason',
-    xgkc:'Change Inventory',
-    shxgkc:'Approve Inventory Change',
-    shbj:'Approve Edit',
-    clr:'Operator',
-    czfs:'Dispose Method',
-    fhr:'Reviewer',
-    xgbz:'修改备注',
-    jdr:'Supervisor',
-    xgr:'Editor',
-    czl:'Amount',
-    ffr:'Issuer',
-    ffr1:'Issuer',
-    ffr2:'Issuer 2',
-    zytj:'Transfer Condition',
-    md:'Purpose',
-    ckmz:'出库毛重',
-    ckl:'Amount out',
-    ckldw:'出库单位',
-    ffzytj:'发放转移条件',
-    ghzytj:'归还转移条件',
-    ckmzdw:'出库毛重单位',
-    ys1lrq:'Key 1 User',
-    ys2lrq:'Key 2 User',
-    sssy:'In Study',
-    ssbd:'In Record',
-    bdssr:'By User',
-    syr:'使用人',
-    lqghr:'Recipient/Returner',
-    ffjsr:'Issuer/接收人',
-    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',
+  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: '转移条件',
+  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: '入库毛重',
+  jsl: '减少量',
+  syl: '使用量',
+  ghr1Id: '归还人',
+  ghr2Id: '归还人2',
+  jsr1Id: '库管员',
+  jsr2Id: '库管员2',
+  tz: '麻精药台账',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  cjsj: '创建时间',
+  rkl: '入库毛重',
+  jysj: '借阅时间',
+  mjyxq: '麻精药详情',
+  ffjlxq: '发放回收记录详情',
+  sswjj:'所属文件夹',
+  ssbd:'所属表单',
+  qmr1Id:'签名人1',
+  qmr2Id:'签名人2',
 
-    bdxx:'Record Information',
-    jbxx:'Information',
-    rkwz:'入库位置',
-    rktj:'入库条件',
-    zytj:'转移条件',
-    rkmz:'入库毛重',
-    jsl:'减少量',
-    syl:'Usage Amount',
-    ghr1Id:'Returner',
-    ghr2Id:'Returner 2',
-    jsr1Id:'Warehouse Keeper',
-    jsr2Id:'Warehouse Keeper 2',
-    tz:'Drug Table',
-    lqsj:'领取时间',
-    jcgj:'Track Record',
-    ffbz:'发放备注',
-    ghbz:'归还备注',
-    cjsj:'Creation Date',
-    jysj:'Checkout Period',
-    mjyxq:'Controlled Drug Detail',
-    ffjlxq:'In-and-Out Record Detail',
-    
-}
+  lqff:'领取发放',
+  sqgd:'申请归档',
+  sqjd:'申请解档',
+  jsmjy:'解锁麻精药',
+  sqjy:'申请借阅',
+  mjyrk:'麻精药入库',
+  sdmjy:'锁定麻精药',
+  tyjjbj:'同意/拒绝编辑',
+  tyjjxgkc:'同意/拒绝修改库存',
+  xgkc:'修改库存',
+  bcsm:'补充说明',
+  jsffjl:'解锁发放记录',
+  sdffjl:'锁定发放记录'
+}

src/lang/en/business/resource/resource.js

@@ -1,6 +1,7 @@
 export default {
   zjzt: {
     rk: 'In Storage',
+    wrk: '未入库',
     yff: 'In Use',
     ysd: 'Locked',
     dgd: 'Pending Archiving',

src/lang/en/business/resource/zcg.js

@@ -1,18 +1,18 @@
 export default {
-    ysbh: 'ID',
+    ysbh: '钥匙编号',
     jyr: '借用人',
-    zt: 'Status',
-    jyz: 'In Use',
-    wjy: 'Not in Use',
-    plgh: 'Batch Return',
-    zcg: 'Locker',
-    ysbh: 'ID',
-    ys1jyr: 'Key 1 User',
-    ys2jyr: 'Key 2 User',
-    glyj: 'Contained Substance',
-    ysff: 'Issue Key',
-    gh: 'Return Key',
-    ysgh: 'Return Key',
+    zt: '状态',
+    jyz: '借用中',
+    wjy: '未借用',
+    plgh: '批量归还',
+    zcg: '暂存柜',
+    ysbh: '钥匙编号',
+    ys1jyr: '钥匙1借用人',
+    ys2jyr: '钥匙2借用人',
+    glyj: '关联药剂',
+    ysff: '发放钥匙',
+    gh: '归还',
+    ysgh: '钥匙归还',
     ysghts:'请确认是否归还以下钥匙',
     ghr1Id:'钥匙1归还人',
     ghr1mm:'钥匙1归还人密码',
@@ -20,13 +20,14 @@ export default {
     ghr2mm:'钥匙2归还人密码',
     jsr:'接收人',
     jsrmm:'接收人密码',
-    qmyy:'Purpose',
-    remark:'Remark',
-    lqr1Id:'Key 1 User',
-    lqr1mm:'Key 1 User Password',
-    lqr2Id:'Key 2 User',
-    lqr2mm:'Key 2 User Password',
-    ffr:'Distribute User',
-    ffrmm:'Distribute User Password',
-
+    qmyy:'签名意义',
+    remark:'备注',
+    lqr1Id:'钥匙1领取人',
+    lqr1mm:'钥匙1领取人密码',
+    lqr2Id:'钥匙2领取人',
+    lqr2mm:'钥匙2领取人密码',
+    ffr:'发放人',
+    ffrmm:'发放人密码',
+    qysff:'钥匙发放',
+    qysgh:'钥匙归还'
 }

src/lang/zh/business/resource/gyzj.js

@@ -20,11 +20,11 @@ export default {
   syl: '使用量',
   lqr1: '领取人',
   lqr2: '领取人2',
-    yslqr1:'钥匙1领取人',
-    yslqr2:'钥匙2领取人',
+  yslqr1: '钥匙1领取人',
+  yslqr2: '钥匙2领取人',
   kgy1: '库管员',
   kgy2: '库管员2',
-rkmz:'入库毛重',
+  rkmz: '入库毛重',
   plff: '批量发放',
   plczyj: '批量处置药剂',
   plczrq: '批量处置容器',
@@ -39,7 +39,6 @@ rkmz:'入库毛重',
   jieyue: '借阅',
   guihuan: '确认归还',
   fafang: '发放',
-  ysff: '钥匙发放',
   czrq: '处置容器',
   czyj: '处置药剂',
   yuanyin: '原因',
@@ -102,6 +101,22 @@ rkmz:'入库毛重',
   gyzjxq: '给药制剂详情',
   sqguihuan: '归还',
   qrrk: '确认入库',
-  qmr1Id:'签名人1',
-  qmr2Id:'签名人2',
+  qmr1Id: '签名人1',
+  qmr2Id: '签名人2',
+
+  lqff: '领取发放',
+  sqgd: '申请归档',
+  sqjd: '申请解档',
+  jsgyzj: '解锁给药制剂',
+  sqjy: '申请借阅',
+  tyjjrk: '同意/拒绝入库',
+  sdgyzj: '锁定给药制剂',
+  tyjjbj: '同意/拒绝编辑',
+  tyjjxgkc: '同意/拒绝修改库存',
+  gyzjrk: '给药制剂入库',
+ ruku:'入库',
+  xgkc: '修改库存',
+  bcsm: '补充说明',
+  jsffjl: '解锁发放记录',
+  sdffjl: '锁定发放记录'
 }

src/lang/zh/business/resource/mjy.js

@@ -39,7 +39,6 @@ export default {
   jieyue: '借阅',
   guihuan: '归还',
   fafang: '发放',
-  ysff: '钥匙发放',
   czrq: '处置容器',
   czyj: '处置药剂',
   yuanyin: '原因',
@@ -109,4 +108,18 @@ export default {
   ssbd:'所属表单',
   qmr1Id:'签名人1',
   qmr2Id:'签名人2',
+
+  lqff:'领取发放',
+  sqgd:'申请归档',
+  sqjd:'申请解档',
+  jsmjy:'解锁麻精药',
+  sqjy:'申请借阅',
+  mjyrk:'麻精药入库',
+  sdmjy:'锁定麻精药',
+  tyjjbj:'同意/拒绝编辑',
+  tyjjxgkc:'同意/拒绝修改库存',
+  xgkc:'修改库存',
+  bcsm:'补充说明',
+  jsffjl:'解锁发放记录',
+  sdffjl:'锁定发放记录'
 }

src/lang/zh/business/resource/zcg.js

@@ -28,4 +28,6 @@ export default {
     lqr2mm:'钥匙2领取人密码',
     ffr:'发放人',
     ffrmm:'发放人密码',
+    qysff:'钥匙发放',
+    qysgh:'钥匙归还'
 }

src/views/business/resource/gyzj/comps/ffjl/Gd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.gyzj.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/ffjl/Jd.vue

@@ -93,7 +93,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.gyzj.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/ffjl/Jq.vue

@@ -83,7 +83,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '补充说明',
+        qmyy: this.$t('page.business.resource.gyzj.bcsm'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/ffjl/Js.vue

@@ -83,7 +83,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁发放记录',
+        qmyy: this.$t('page.business.resource.gyzj.jsffjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/ffjl/Jy.vue

@@ -114,7 +114,7 @@ export default {
         startDate: null,
         endDate: null,
         bh: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.gyzj.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/ffjl/Sd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定发放记录',
+        qmyy: this.$t('page.business.resource.gyzj.sdffjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Bj.vue

@@ -167,7 +167,7 @@ export default {
         cctj: null,
         ccwz: null,
         qmrmm: null,
-        qmyy: '编辑',
+        qmyy: this.$t('page.form.edit'),
         bjbz: ''
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Czrq.vue

@@ -232,7 +232,7 @@ export default {
         clrId: null,
         fhrId: null,
         jdrId: null,
-        qmyy: '处置容器',
+        qmyy: this.$t('page.business.resource.gyzj.czrq'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Czyj.vue

@@ -255,7 +255,7 @@ export default {
         fhrId: null,
         jdrId: null,
         czl: null,
-        qmyy: '处置药剂',
+        qmyy: this.$t('page.business.resource.gyzj.czyj'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Ff.vue

@@ -358,7 +358,7 @@ export default {
         ffr2Id: null,
         ffr2Mc: null,
         ffr2mm: null,
-        qmyy: '领取发放',
+        qmyy: this.$t('page.business.resource.gyzj.lqff'),
         qmrmm: null,
         remark: null
       }

src/views/business/resource/gyzj/comps/gyzj/Gd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.gyzj.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Gh.vue

@@ -243,7 +243,7 @@ export default {
     },
     reset() {
       this.form = {
-        qmyy: '确认归还',
+        qmyy: this.$t('page.business.resource.gyzj.guihuan'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gyzj/comps/gyzj/Jd.vue

@@ -104,7 +104,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.gyzj.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Js.vue

@@ -83,7 +83,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁给药制剂',
+        qmyy: this.$t('page.business.resource.gyzj.jsgyzj'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Jy.vue

@@ -136,7 +136,7 @@ export default {
         bh: null,
         startDate: null,
         endDate: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.gyzj.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Rk.vue

@@ -244,7 +244,7 @@ export default {
     reset() {
       this.form = {
         qmyy: null,
-        qmyyMc: '同意/拒绝入库',
+        qmyyMc: this.$t('page.business.resource.gyzj.tyjjrk'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gyzj/comps/gyzj/Sd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定给药制剂',
+        qmyy: this.$t('page.business.resource.gyzj.sdgyzj'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Shbj.vue

@@ -185,7 +185,7 @@ export default {
         bjrMc: null,
         bjbz: null,
         qmyy: null,
-        qmyyMc: '同意/拒绝编辑',
+        qmyyMc: this.$t('page.business.resource.gyzj.tyjjbj'),
         remark: ''
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue

@@ -139,7 +139,7 @@ export default {
         kcbjbz: null,
         remark: '',
         qmyy: null,
-        qmyyMc: '同意/拒绝修改库存',
+        qmyyMc: this.$t('page.business.resource.gyzj.tyjjxgkc'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue

@@ -203,7 +203,7 @@ export default {
     },
     reset() {
       this.form = {
-        qmyy: '归还',
+        qmyy: this.$t('page.business.resource.gyzj.sqguihuan'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 申请入库弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.sqrk')" :visible.sync="open" width="800px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gyzj.ruku')" :visible.sync="open" width="800px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
@@ -89,7 +89,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled />
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -170,7 +170,7 @@ export default {
     },
     reset() {
       this.form = {
-        qmyy: '给药制剂入库',
+        qmyyMc: this.$t('page.business.resource.gyzj.gyzjrk'),
       }
       this.resetForm("form")
     },

src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue

@@ -120,7 +120,7 @@ export default {
         kc: null,
         kcdw: null,
         qmrmm: null,
-        qmyy: '修改库存',
+        qmyy: this.$t('page.business.resource.gyzj.xgkc'),
         kcbjbz: ''
       }
       this.resetForm("form")

src/views/business/resource/gyzj/comps/gyzj/Ysff.vue

@@ -192,7 +192,7 @@ export default {
     reset() {
       this.form = {
         ids: null,
-        qmyy: '钥匙发放',
+        qmyy: this.$t('page.business.resource.gyzj.ysff'),
         zcgId: null,
         qmrmm: null,
         remark: null,

src/views/business/resource/mjy/comps/ffjl/Gd.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.lock')" :visible.sync="open" width="500px" append-to-body
+    <!-- 归档弹窗 -->
+    <el-dialog :title="$t('page.business.resource.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.mjy.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/ffjl/Jd.vue

@@ -93,7 +93,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.mjy.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/ffjl/Jq.vue

@@ -83,7 +83,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '补充说明',
+        qmyy: this.$t('page.business.resource.mjy.bcsm'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/ffjl/Js.vue

@@ -83,7 +83,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁发放记录',
+        qmyy: this.$t('page.business.resource.mjy.jsffjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/ffjl/Jy.vue

@@ -114,7 +114,7 @@ export default {
         startDate: null,
         endDate: null,
         bh: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.mjy.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/ffjl/Sd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定发放记录',
+        qmyy: this.$t('page.business.resource.mjy.sdffjl'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/ffjl/Xq.vue

@@ -194,7 +194,6 @@ export default {
   created() {
   },
   methods: {
-   
     cancel() {
       this.open = false
       this.$emit('callback')

src/views/business/resource/mjy/comps/mjy/Bj.vue

@@ -167,7 +167,7 @@ export default {
         cctj: null,
         ccwz: null,
         qmrmm: null,
-        qmyy: '编辑',
+        qmyy: this.$t('page.form.edit'),
         bjbz: ''
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Czrq.vue

@@ -128,7 +128,7 @@ import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
-  name: "Bj",
+  name: "Czrq",
   components: { SelectDeptUser ,BusinessSelect},
   data() {
     return {
@@ -231,7 +231,7 @@ export default {
         clrId: null,
         fhrId: null,
         jdrId: null,
-        qmyy: '处置容器',
+        qmyy: this.$t('page.business.resource.mjy.czrq'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Czyj.vue

@@ -257,7 +257,7 @@ export default {
         fhrId: null,
         jdrId: null,
         czl: null,
-        qmyy: '处置药剂',
+        qmyy: this.$t('page.business.resource.mjy.czyj'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Ff.vue

@@ -385,7 +385,7 @@ export default {
         mdIds: null,
         mdMcs: null,
         mdOther: null,
-        qmyy: '领取发放',
+        qmyy: this.$t('page.business.resource.mjy.lqff'),
         qmrmm: null,
         remark: null
       }

src/views/business/resource/mjy/comps/mjy/Gd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请归档',
+        qmyy: this.$t('page.business.resource.mjy.sqgd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Gh.vue

@@ -326,7 +326,7 @@ export default {
         jsr1mm: null,
         jsr2Id: null,
         jsr2mm: null,
-        qmyy: '归还',
+        qmyy: this.$t('page.business.resource.mjy.guihuan'),
       }
       this.resetForm("form")
     },

src/views/business/resource/mjy/comps/mjy/Jd.vue

@@ -104,7 +104,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: this.$t('page.business.resource.mjy.sqjd'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Js.vue

@@ -83,7 +83,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁麻精药',
+        qmyy: this.$t('page.business.resource.mjy.jsmjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Jy.vue

@@ -136,7 +136,7 @@ export default {
         bh: null,
         startDate: null,
         endDate: null,
-        qmyy: '申请借阅',
+        qmyy: this.$t('page.business.resource.mjy.sqjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Rk.vue

@@ -257,7 +257,7 @@ export default {
         jsr1mm: null,
         jsr2Id: null,
         jsr2mm: null,
-        qmyy: '麻精药入库',
+        qmyy: this.$t('page.business.resource.mjy.mjyrk'),
       }
       this.resetForm("form")
     },

src/views/business/resource/mjy/comps/mjy/Sd.vue

@@ -102,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定麻精药',
+        qmyy: this.$t('page.business.resource.mjy.sdmjy'),
         qmrmm: null
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Shbj.vue

@@ -185,7 +185,7 @@ export default {
         bjrMc: null,
         bjbz: null,
         qmyy: null,
-        qmyyMc: '同意/拒绝编辑',
+        qmyyMc: this.$t('page.business.resource.mjy.tyjjbj'),
         remark: ''
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Shxgkc.vue

@@ -138,7 +138,7 @@ export default {
         kcbjrMc: null,
         kcbjbz: null,
         qmyy: null,
-        qmyyMc: '同意/拒绝修改库存',
+        qmyyMc: this.$t('page.business.resource.mjy.tyjjxgkc'),
         remark: ''
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Xgkc.vue

@@ -118,7 +118,7 @@ export default {
         kc: null,
         kcdw: null,
         qmrmm: null,
-        qmyy: '修改库存',
+        qmyy: this.$t('page.business.resource.mjy.xgkc'),
         kcbjbz: ''
       }
       this.resetForm("form")

src/views/business/resource/mjy/comps/mjy/Ysff.vue

@@ -186,7 +186,7 @@ export default {
     reset() {
       this.form = {
         ids: null,
-        qmyy: '钥匙发放',
+        qmyy: this.$t('page.business.resource.mjy.ysff'),
         zcgId: null,
         qmrmm: null,
         remark: null,

src/views/business/resource/zcg/comps/Ysff.vue

@@ -143,7 +143,7 @@ export default {
         id: null,
         mc: null,
         glyj: null,
-        qmyy: '钥匙发放',
+        qmyy: this.$t('page.business.resource.zcg.qysff'),
         remark: null,
         lqr1Id: null,
         lqr2Id: null,

src/views/business/resource/zcg/comps/Ysgh.vue

@@ -152,7 +152,7 @@ export default {
         id: null,
         ids: null,
         mc: null,
-        qmyy: '钥匙归还',
+        qmyy: this.$t('page.business.resource.zcg.qysgh'),
         ghr1Id: null,
         ghr2Id: null,
         ghr1mm: null,

src/views/business/study/comp/wzlb/gyzjList.vue

@@ -56,6 +56,7 @@
           <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 2">{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>
               <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
               <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
               <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>
@@ -92,6 +93,10 @@
                       $t('page.business.resource.gyzj.xgkc') }}</el-button>
                 </template>
               </template>
+              <!-- 入库 -->
+              <el-button type="text" v-if="scope.row.zjzt==2" @click="handleRk(scope.row)"
+                v-hasPermi="['business:studyGyzj:rk', 'business:nonTrialGyzj:rk', 'business:drugGyzj:rk']">{{
+                  $t('page.business.resource.gyzj.ruku') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -105,6 +110,8 @@
       <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
       <!-- 归还 -->
       <Sqgh key="Sqgh" ref="Sqgh" @callback="handleQuery" />
+      <!-- 入库 -->
+      <Sqrk key="Sqrk" ref="Sqrk" @callback="handleQuery" />
       <!-- 处置药剂 -->
       <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
       <!-- 详情 -->
@@ -119,12 +126,13 @@ import Xq from "@/views/business/resource/gyzj/comps/gyzj/Xq";
 import Bj from "@/views/business/resource/gyzj/comps/gyzj/Bj";
 import Xgkc from "@/views/business/resource/gyzj/comps/gyzj/Xgkc";
 import Sqgh from "@/views/business/resource/gyzj/comps/gyzj/Sqgh";
+import Sqrk from "@/views/business/resource/gyzj/comps/gyzj/Sqrk";
 import Czyj from "@/views/business/resource/gyzj/comps/gyzj/Czyj";
 import moment from "moment";
 
 export default {
   name: "GyzjList",
-  components: { Xq, Bj, Xgkc, Sqgh, Czyj },
+  components: { Xq, Bj, Xgkc, Sqgh, Czyj,Sqrk },
   data() {
     return {
       daterange: [],
@@ -187,6 +195,10 @@ export default {
     handleGh(row) {
       this.$refs.Sqgh.show(row)
     },
+    //入库
+    handleRk(row) {
+      this.$refs.Sqrk.show(row)
+    },
     closeXq() {
       this.showDetail = false
       this.handleQuery()

src/views/business/study/comp/wzlb/mjyList.vue

@@ -19,6 +19,7 @@
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.wrk')" :value="2" />
               <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
               <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
               <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />