Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

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
   })
 }

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: '新增供试品入库记录',
 }

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

@@ -1,121 +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: '给药制剂入库',
-
-  xgkc: '修改库存',
+  ruku: 'In Storage',
+  xgkc: 'Change Inventory',
   bcsm: '补充说明',
   jsffjl: '解锁发放记录',
   sdffjl: '锁定发放记录'

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

@@ -1,124 +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:'锁定发放记录'

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

@@ -1,6 +1,7 @@
 export default {
   sdts: '请确认是否锁定以下麻精药',
   gdts: '请确认是否归档以下麻精药',
+  sjxq: 'Reagent Detail',
   mc: 'Name',
   bh: 'ID',
   ssbm: 'Department',
@@ -54,4 +55,9 @@ export default {
   czsj: 'Datetime',
 
   jcgj: 'Track Record',
+  sqgd: 'Apply for Archiving',
+  sqjd: 'Apply for De-archiving',
+  jssj: 'Unlock',
+  sqjy: 'Apply for Check-out',
+  sdsj: 'Lock',
 }

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'
 }

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'
 }

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: 'Setup',
+  bdtb: '表单填报',
+  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: 'Signed By',
+  qmyy: 'Purpose',
+  qmsj: 'Date',
+  bzyy: 'Comment/Reason',
+  jcgj: 'Track Record',
+  cjjl: 'Create',
+  sfbl: '是否为补录',
+  yes: 'Yes',
+  no: 'No',
+  tjjl: '提交记录',
+  sqfz: '申请废止',
+  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: 'Approve',
+  ksxcfh: '开始现场复核',
+  jsxcfh: '结束现场复核',
+  smxz: '申明协作',
+  bcsm: '补充说明',
+  fztgjj: '废止通过/拒绝',
+  ysy: '已审阅'
 }

src/lang/en/business/study/studyFormFill.js

@@ -1,64 +1,75 @@
 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: '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: 'Signed By',
+  qmyy: 'Purpose',
+  qmsj: 'Date',
+  bzyy: 'Comment/Reason',
+  jcgj: 'Track Record',
+  cjjl: '创建记录',
+  sfbl: '是否为补录',
+  yes: 'Yes',
+  no: 'No',
+  tjjl: '提交记录',
+  sqfz: '申请废止',
+  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: 'Approve',
+  txbtjjl: '填写并提交记录',
+  zztjyzbd: '制作提交预制表单',
+  mfhtg: '免复核通过',
+  lianghao: 'Good',
+  zhong: 'Average',
+  cha: 'Bad',
+  ksxcfh: '开始现场复核',
+  jsxcfh: '结束现场复核',
+  smxz: '申明协作',
+  bcsm: '补充说明',
+  fztgjj: '废止通过/拒绝',
+  ysy: '已审阅',
 }

src/lang/en/business/study/studyFormPlan.js

@@ -1,6 +1,6 @@
 export default {
   jcsz: 'Setup',
-  bdtb: 'Preset Design',
+  bdtb: '表单填报',
   xzbd: 'Create',
   fh: 'QC',
   ghgsr: 'Change Owner',
@@ -8,26 +8,28 @@ export default {
   gc: 'View',
   bdsm: 'Description',
   zc: 'Save',
-  next:'Next',
-  save:'Save',
-  pre:'Pre',
-  submit:'Submit',
-  qmxx: 'Signature Information',
+  next: 'Next',
+  pre: 'Pre',
+  save: 'Save',
+  submit: 'Submit',
+  bdnr: '表单内容',
+  qmxx: '签名信息',
   qmr: 'Signed By',
   qmyy: 'Purpose',
   qmsj: 'Date',
-  bzyy: 'Comment',
+  bzyy: 'Comment/Reason',
   jcgj: 'Track Record',
-  xzpzjhb:'Create',
-  yes:'Yes',
-  no:'No',
-  shryId:'QC User',
-  tjjl: 'Submit Record',
-  dcqbjcgj: '导出(全部稽查轨迹)',
-  dclcjcgj: '导出(流程稽查轨迹)',
-  dcbjjcgj: '导出(编辑稽查轨迹)',
-  dcxgjcgj: '导出(修改稽查轨迹)',
-  dcbhsjgj: '导出(不含数据轨迹)',
+  cjjl: 'Create',
+  xzpzjhb: 'Create',
+  yes: 'Yes',
+  no: 'No',
+  shryId: '复核人员',
+  tjjl: '提交记录',
+  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',
@@ -37,8 +39,8 @@ export default {
   reason: 'Reason',
   approve: 'Approve',
   shenyue: 'Review',
-  fhjj:'Review rejected',
-  fhtg:'Review approved',
+  fhjj: '复核拒绝',
+  fhtg: '复核通过',
   tongguo: 'Approve',
   syxx: 'Information',
   symc: 'Study Name',
@@ -46,7 +48,8 @@ export default {
   syfzr: 'Study Director',
   cjsj: 'Creation Date',
   sdsy: 'Lock Study',
-  syjj: 'Description',
+  syjj: '试验简介',
   xz: 'Create',
-  syxkxx: 'Discipline'
+  syxkxx: 'Discipline',
+  ysy: '已审阅'
 }

src/lang/en/business/study/studyFormPre.js

@@ -1,35 +1,39 @@
 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: 'Setup',
+  bdsj: 'Preset Design',
+  xzbd: 'Create',
+  zc: 'Save',
+  next: 'Next',
+  pre: 'Pre',
+  save: 'Save',
+  submit: 'Submit',
+  bdsm: 'Description',
+  tjysb: '提交预设表',
+  shryId: '审核人员',
+  fzrsh: '是否需要试验负责人审核',
+  approve: 'Approve',
+  reject: 'Reject',
+  shtg: '审核通过',
+  shjj: '审核拒绝',
+  tb: '填报',
+  bdnr: '表单内容',
+  qmxx: '签名信息',
+  qmr: 'Signed By',
+  qmyy: 'Purpose',
+  qmsj: 'Date',
+  bzyy: 'Comment/Reason',
+  jcgj: 'Track Record',
+  cjjl: 'Create',
+  xjbd: 'Create',
+  fzbdxz: '复制表单选择',
+  sssyfsy: 'From Study/Non-study',
+  fzbd: 'Copy Preset',
+  fzbj: 'Copy and Edit',
+  yulan: 'Preview',
+  ts: '是否确定用该预填模板进行实际填报？',
+  cjxbd: 'Create Preset',
+  fzyybd: 'Copy Existing Preset',
+  yes: 'Yes',
+  no: 'No',
+  zztjyzbd: '制作提交预制表单'
 }

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: '新增供试品入库记录',
 }
+

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: '审核修改库存',
@@ -78,7 +82,6 @@ export default {
   jiaqian: '加签',
   gyzjgl: '给药制剂管理',
   ffhsjl: '发放回收记录',
-
   bdxx: '表单信息',
   jbxx: '基本信息',
   rkwz: '入库位置',
@@ -103,7 +106,6 @@ export default {
   qrrk: '确认入库',
   qmr1Id: '签名人1',
   qmr2Id: '签名人2',
-
   lqff: '领取发放',
   sqgd: '申请归档',
   sqjd: '申请解档',
@@ -114,7 +116,7 @@ export default {
   tyjjbj: '同意/拒绝编辑',
   tyjjxgkc: '同意/拒绝修改库存',
   gyzjrk: '给药制剂入库',
- ruku:'入库',
+  ruku: '入库',
   xgkc: '修改库存',
   bcsm: '补充说明',
   jsffjl: '解锁发放记录',

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

@@ -24,10 +24,11 @@ export default {
   yslqr2: '钥匙2领取人',
   kgy1: '库管员',
   kgy2: '库管员2',
-
   plff: '批量发放',
   plczyj: '批量处置药剂',
   plczrq: '批量处置容器',
+  plczyjt: '批量处置药剂',
+  plczrqt: '批量处置容器',
   ysff: '钥匙发放',
   plsd: '批量锁定',
   plgd: '批量归档',
@@ -41,6 +42,8 @@ export default {
   fafang: '发放',
   czrq: '处置容器',
   czyj: '处置药剂',
+  czrqt: '处置容器',
+  czyjt: '处置药剂',
   yuanyin: '原因',
   xgkc: '修改库存',
   shxgkc: '审核修改库存',
@@ -59,7 +62,6 @@ export default {
   md: '目的',
   ckmz: '出库毛重',
   ckl: '出库量',
-  ckldw: '出库单位',
   ffzytj: '发放转移条件',
   ghzytj: '归还转移条件',
   ckmz: '出库毛重',
@@ -108,7 +110,6 @@ export default {
   ssbd:'所属表单',
   qmr1Id:'签名人1',
   qmr2Id:'签名人2',
-
   lqff:'领取发放',
   sqgd:'申请归档',
   sqjd:'申请解档',

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

@@ -1,6 +1,7 @@
 export default {
   sdts: '请确认是否锁定以下麻精药',
   gdts: '请确认是否归档以下麻精药',
+  sjxq: '试剂详情',
   mc: '名称',
   bh: '编号',
   ssbm: '所属部门',
@@ -55,4 +56,9 @@ export default {
   czsj: '操作时间',
 
   jcgj: '稽查轨迹',
+  sqgd: '申请归档',
+  sqjd: '申请解档案',
+  jssj: '解锁试剂',
+  sqjy: '申请借阅',
+  sdsj: '锁定试剂',
 }

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

@@ -8,5 +8,7 @@ export default {
     yqxh: '仪器型号',
     yqly: '仪器来源',
     wc: '温层',
-    xgnr: '修改内容'
+    xgnr: '修改内容',
+    xzyq: '新增仪器',
+    bjyq: '编辑仪器',
 }

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: '关联药剂',

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: '已审阅'
 }

src/lang/zh/business/study/studyFormFill.js

@@ -1,66 +1,76 @@
 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: '已审阅',
 }

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: '已审阅'
 }

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: '制作提交预制表单'
 }

src/views/business/comps/select/SelectStudyUser.vue

@@ -0,0 +1,116 @@
+<template>
+  <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')" clearable  :disabled="readonly" :multiple="multiple" @change="handleChange" filterable>
+    <el-option v-for="item in list"  :key="item.id" :label="item.name" :value="item.id" />
+  </el-select>
+</template>
+
+<script>
+import { studyUser } from "@/api/system/user";
+export default {
+  name: "SelectStudyUser",
+  components: {},
+  props: {
+    value: {
+      type: [Number, String , Array],
+      default: '',
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    placeholder:{
+      type:String,
+      default:''
+    },
+
+    query: {
+      type: Object,
+      default:()=>{
+        return {
+          studyId:'',
+          studySubject:'',
+          permit:''
+        }
+      }
+    },
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        if(!this.multiple){
+          this.selected = v ? (v+'') : ''
+        }else{
+          if(v){
+            //默认传的,分割的字符串，有传数组再改造
+            let arr = v.split(',')
+            let s = []
+            _.forEach(arr,a=>{
+              s.push(a)
+            })
+            this.selected = s
+          }else{
+            this.selected = []
+          }
+        }
+      }
+    },
+    // query:{
+    //   handler(v) {
+    //     this.getList()
+    //   }
+    // }
+  },
+  data() {
+    return {
+      selected: '',
+      list: []
+    };
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.list = []
+      studyUser(this.query).then(response => {
+        this.list = response.data || []
+      })
+    },
+    handleChange(val) {
+      //默认传的,分割的字符串，有传数组再改造
+      this.$emit('input', this.multiple ? (val && val.length>0 ? val.join(','): ''):(val || ''))
+      if(this.multiple){
+        debugger
+        let arr = []
+        if(val && val.length>0){
+          for(let i=0;i<val.length;i++){
+            for(let j=0;j<this.list.length;j++){
+              if(val[i]===this.list[j].id){
+                arr.push(this.list[j])
+                break
+              }
+            }
+          }
+        }
+        this.$emit('change',arr)
+      }else{
+        let obj = {}
+        if(val){
+          for(let j=0;j<this.list.length;j++){
+            if(val===this.list[j].id){
+              obj = this.list[j]
+              break
+            }
+          }
+        }
+        this.$emit('change', obj)
+      }
+    },
+  }
+};
+</script>

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")

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")

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")

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")

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")

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")

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")
     },

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
       }

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
       }

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
       }

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")

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")
     },

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")

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")

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")

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")

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

@@ -58,10 +58,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
-                <el-option  label="同意编辑" :value="10" />
-                <el-option label="拒绝编辑" :value="1" />
-              </el-select>
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -89,8 +86,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -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()
           })
         }
       })

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

@@ -48,10 +48,7 @@
         <el-row>
          <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
-                <el-option  label="同意修改库存" :value="10" />
-                <el-option  label="拒绝修改库存" :value="1" />
-              </el-select>
+              <el-input type="text" :value="form.qmyyMc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -79,8 +76,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+        <el-button type="danger" @click="save(1)">{{ $t('form.reject') }}</el-button>
+        <el-button type="primary" @click="save(10)">{{ $t('form.approve') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -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()
           })
         }
       })

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: '',

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")

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

@@ -91,7 +91,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr')">
-              <el-input type="text" v-model="nickName" maxlength="50" 
+              <el-input type="text" v-model="nickName" maxlength="50"
                 :placeholder="$t('form.placeholderInput')" disabled/>
             </el-form-item>
           </el-col>
@@ -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,

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")
     },

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")

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")

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")

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")

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")

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")

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")

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 处置容器弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.czrq')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="isBatch?$t('page.business.resource.gyzj.plczrqt'):$t('page.business.resource.gyzj.czrqt')" :visible.sync="open" width="1200px" 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>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 处置药剂弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.czyj')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="isBatch?$t('page.business.resource.gyzj.plczyjt'):$t('page.business.resource.gyzj.czyjt')" :visible.sync="open" width="1200px" 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>

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

@@ -44,7 +44,7 @@
         <el-row>
           <el-col :span="12">
             <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-col :span="12">

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

@@ -18,13 +18,8 @@
                     {{ scope.row.ckl }}{{ scope.row.ckldw }}
                   </template>
                 </el-table-column>
-
                 <el-table-column :label="$t('page.business.resource.gyzj.ffzytj')" align="center" prop="ffzytj"
                   width="150px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" prop="ckl"
-                  width="150px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckldw')" align="center" prop="ckldw"
-                  width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"

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")

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 处置容器弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.czrq')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="isBatch?$t('page.business.resource.mjy.plczrqt'):$t('page.business.resource.mjy.czrqt')" :visible.sync="open" width="1200px" 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>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 处置药剂弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.czyj')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="isBatch?$t('page.business.resource.mjy.plczyjt'):$t('page.business.resource.mjy.czyjt')" :visible.sync="open" width="1200px" 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>

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

@@ -44,7 +44,7 @@
         <el-row>
           <el-col :span="12">
             <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-col :span="12">

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

@@ -142,7 +142,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '编辑',
+        qmyy: this.$t('page.form.edit'),
         sdrmm: null
       }
       this.resetForm("form")

src/views/business/resource/sj/comps/Cz.vue

@@ -128,7 +128,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '处置',
+        qmyy: this.$t('page.business.resource.sj.cz'),
         kcdw: '',
         qmrmm: null
       }

src/views/business/resource/sj/comps/CzBatch.vue

@@ -136,7 +136,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '处置',
+        qmyy: this.$t('page.business.resource.sj.cz'),
         kcdw: '',
         qmrmm: null
       }

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

@@ -1,157 +0,0 @@
-<template>
-  <div >
-    <!-- 发放弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.fafang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.resource.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <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
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName','name'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>

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")

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

@@ -1,157 +0,0 @@
-<template>
-  <div >
-    <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.resource.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <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
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName','name'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>

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")

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")

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")

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")

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: '',

src/views/business/resource/sj/comps/Xq.vue

@@ -9,10 +9,9 @@
         </div>
         <div class="right-top">
         <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
-          <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
-       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.mjy.mjyxq') }}<img src="@/assets/images/detail-title.png" /></div>
+       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.sj.sjxq') }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
@@ -89,21 +88,21 @@
           <div class="pal">
             <div class="left">
               <div class="left-title">{{ $t('page.business.resource.sj.ssbd') }}</div>
-              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
+              <el-input type="text" :value="form.formName" maxlength="50" disabled />
             </div>
             <div class="right">
               <div class="right-title">{{ $t('page.business.resource.sj.bdsssy') }}</div>
-              <el-input type="text" :value="form.bdMc" maxlength="50" disabled />
+              <el-input type="text" :value="form.studyName" maxlength="50" disabled />
             </div>
           </div>
           <div class="pal">
             <div class="left">
               <div class="left-title">{{ $t('page.business.resource.sj.bdssr') }}</div>
-              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
+              <el-input type="text" :value="form.formUserName" maxlength="50" disabled />
             </div>
             <div class="right">
               <div class="right-title">{{ $t('page.business.resource.sj.bdssbm') }}</div>
-              <el-input type="text" :value="form.bdMc" maxlength="50" disabled />
+              <el-input type="text" :value="form.deptName" maxlength="50" disabled />
             </div>
           </div>
           <div class="content-title">

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

@@ -1,157 +0,0 @@
-<template>
-  <div >
-    <!-- 钥匙发放弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.ysff')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.resource.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <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
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName','name'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>

src/views/business/resource/sj/list.vue

@@ -17,7 +17,7 @@
           </el-form-item>
           <!-- 所属部门 -->
           <el-form-item :label="$t('page.business.resource.sj.ssbm') + '：'">
-            <el-input v-model="queryParams.bm" clearable @change="handleQuery"
+            <el-input v-model="queryParams.deptName" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 借阅状态 -->
@@ -97,12 +97,16 @@
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.sj.gg')" align="center" prop="gg" width="150px" />
           <el-table-column :label="$t('page.business.resource.sj.ly')" align="center" prop="ly" width="150px" />
-          <el-table-column :label="$t('page.business.resource.sj.ssbm')" align="center" prop="ssbm" width="150px" />
-          <el-table-column :label="$t('page.business.resource.sj.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.ssbm')" align="center" prop="deptName" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.sssy')" align="center" prop="studyName" width="150px" />
           <el-table-column :label="$t('page.business.resource.sj.ph')" align="center" prop="ph" width="150px" />
-          <el-table-column :label="$t('page.business.resource.sj.yxzq')" align="center" prop="yxzq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.yxzq')" align="center" prop="yxzq" width="150px" >
+            <template slot-scope="scope">
+              {{ scope.row.yxzq }}{{ scope.row.yxzqdw }}
+            </template>
+          </el-table-column>
 
-          <el-table-column :label="$t('page.business.resource.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.mjy.sxrq')" align="center" prop="sxr" width="150px" />
           <el-table-column :label="$t('page.business.resource.mjy.cctj')" align="center" prop="cctj" width="130px" />
           <el-table-column :label="$t('page.business.resource.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
 

src/views/business/resource/yq/list.vue

@@ -191,7 +191,7 @@ export default {
       },
       // 表单参数
       form: {
-        'qmyy': '新增仪器'
+        'qmyy': this.$t('page.form.add')
       },
       // 表单校验
       rules: {
@@ -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.form.qmyy = this.$t('page.business.resource.yq.bjyq')
         this.open = true
         this.title = this.$t('form.edit')
       })

src/views/business/resource/zcg/list.vue

@@ -5,7 +5,7 @@
       <el-form-item :label="$t('page.business.resource.zcg.zcg') + '：'">
         <el-input v-model="queryParams.mc" clearable @change="handleQuery" :placeholder="$t('form.placeholderInput')" />
       </el-form-item>
-      <!-- 借阅人 -->
+      <!-- 借用人 -->
       <el-form-item :label="$t('page.business.resource.zcg.jyr') + '：'">
         <el-input v-model="queryParams.jyrId" clearable @change="handleQuery"
           :placeholder="$t('form.placeholderInput')" />

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()

src/views/business/study/comp/jhbd/Fh.vue

@@ -59,7 +59,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+              <el-input type="text" :value="formApprove.qmyyMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -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: '',

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,

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: '',
       }

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")

src/views/business/study/comp/sqbd/Fh.vue

@@ -59,7 +59,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+              <el-input type="text" :value="formApprove.qmyyMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -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: '',

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
       }

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,

src/views/business/study/comp/sqbd/Jq.vue

@@ -8,10 +8,10 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
-                <el-option label="开始现场复核" value="开始现场复核" />
-                <el-option label="结束现场复核" value="结束现场复核" />
-                <el-option label="申明协作" value="申明协作" />
-                <el-option label="补充说明" value="补充说明" />
+                <el-option :label="$t('page.business.study.studyFormApply.ksxcfh')" value="开始现场复核" />
+                <el-option :label="$t('page.business.study.studyFormApply.jsxcfh')" value="结束现场复核" />
+                <el-option :label="$t('page.business.study.studyFormApply.smxz')" value="申明协作" />
+                <el-option :label="$t('page.business.study.studyFormApply.bcsm')" value="补充说明" />
               </el-select>
             </el-form-item>
           </el-col>

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

src/views/business/study/comp/sqbd/Sh.vue

@@ -59,7 +59,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+              <el-input type="text" :value="formApprove.qmyyMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -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: '',

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: '',

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: '',
       },

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: '',

src/views/business/study/comp/tbbd/Fh.vue

@@ -62,7 +62,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+              <el-input type="text" :value="formApprove.qmyyMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -111,7 +111,7 @@
 </template>
 
 <script>
-import { studyFormFill_fhtg, studyFormFill_fhjj,studyFormFill_updateZdgxjl,studyFormFill_updateFhyjjl, studyFormFill_tg, studyFormFill_info, studyFormFill_jcgj, studyFormFill_qmxx } from "@/api/business/study/studyFormFill"
+import { studyFormFill_fhtg, studyFormFill_fhjj, studyFormFill_updateZdgxjl, studyFormFill_updateFhyjjl, studyFormFill_tg, studyFormFill_info, studyFormFill_jcgj, studyFormFill_qmxx } from "@/api/business/study/studyFormFill"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -163,36 +163,36 @@ export default {
   },
   methods: {
     onFhCallback(data) {
-       console.log("data:" + JSON.stringify(data))
+      console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
       if (data.type == 'checkbox') {
         // {"type":"checkbox","fieldCheckObj":"{\"_methodCode\":{\"checked\":false}}"}
         studyFormFill_updateZdgxjl(
           {
-            id:this.form.id,
-            zdxgjl:JSON.stringify(data.fieldCheckObj)
+            id: this.form.id,
+            zdxgjl: JSON.stringify(data.fieldCheckObj)
           }
         ).then(response => {
         })
       }
-     else if (data.type == 'content') {
+      else if (data.type == 'content') {
         // {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
         studyFormFill_updateFhyjjl(
           {
-            id:this.form.id,
-            content:JSON.stringify(data.newRecord),
-            fhyjjl:JSON.stringify(data.resourceList)
+            id: this.form.id,
+            content: JSON.stringify(data.newRecord),
+            fhyjjl: JSON.stringify(data.resourceList)
           }
         ).then(response => {
         })
       }
-     else  if (data.type == 'reply') {
+      else if (data.type == 'reply') {
         // {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]}
         studyFormFill_updateFhyjjl(
           {
-            id:this.form.id,
-            replay:JSON.stringify(data.newRecord),
-            fhyjjl:JSON.stringify(data.resourceList)
+            id: this.form.id,
+            replay: JSON.stringify(data.newRecord),
+            fhyjjl: JSON.stringify(data.resourceList)
           }
         ).then(response => {
         })
@@ -248,10 +248,13 @@ export default {
         this.formApprove.qmyy = qmyy
         if (qmyy == '复核通过') {
           this.openTitle = 'page.business.study.studyFormFill.fhtg'
+          this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.fhtg')
         } else if (qmyy == '复核拒绝') {
           this.openTitle = 'page.business.study.studyFormFill.fhjj'
+          this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.fhjj')
         } else if (qmyy == '通过') {
           this.openTitle = 'page.business.study.studyFormFill.tongguo'
+          this.formApprove.qmyyMc = this.$t('page.business.study.studyFormFill.mfhtg')
         }
       }
     },
@@ -259,6 +262,7 @@ export default {
       this.formApprove = {
         id: null,
         qmyy: '',
+        qmyyMc: '',
         bdnr: '',
         remark: '',
         reason: '',

src/views/business/study/comp/tbbd/Fz.vue

@@ -88,7 +88,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyy: '申请废止',
+        qmyy: this.$t('page.business.study.studyFormFill.sqfz'),
         remark: null,
         qmrmm: null
       }

src/views/business/study/comp/tbbd/Gc.vue

@@ -8,9 +8,9 @@
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormFill.szqk')" prop="qmyy">
               <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
-                <el-option label="良好" value="良好" />
-                <el-option label="中" value="中" />
-                <el-option label="差" value="差" />
+                <el-option :label="$t('page.business.study.studyFormFill.lianghao')" value="良好" />
+                <el-option :label="$t('page.business.study.studyFormFill.zhong')" value="中" />
+                <el-option :label="$t('page.business.study.studyFormFill.cha')" value="差" />
               </el-select>
             </el-form-item>
           </el-col>

src/views/business/study/comp/tbbd/Ghgsr.vue

@@ -93,7 +93,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyy: '更换归属人',
+        qmyy: $t('page.business.study.studyFormFill.ghgsr'),
         userId: null,
         UserMc: null,
         remark: null,

src/views/business/study/comp/tbbd/Jq.vue

@@ -8,10 +8,10 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
-                <el-option label="开始现场复核" value="开始现场复核" />
-                <el-option label="结束现场复核" value="结束现场复核" />
-                <el-option label="申明协作" value="申明协作" />
-                <el-option label="补充说明" value="补充说明" />
+                <el-option :label="$t('page.business.study.studyFormFill.ksxcfh')" value="开始现场复核" />
+                <el-option :label="$t('page.business.study.studyFormFill.jsxcfh')" value="结束现场复核" />
+                <el-option :label="$t('page.business.study.studyFormFill.smxz')" value="申明协作" />
+                <el-option :label="$t('page.business.study.studyFormFill.bcsm')" value="补充说明" />
               </el-select>
             </el-form-item>
           </el-col>

src/views/business/study/comp/tbbd/Qrfz.vue

@@ -88,7 +88,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyymc: '废止通过/拒绝',
+        qmyymc: $t('page.business.study.studyFormFill.fztgjj'),
         qmyy: null,
         remark: null,
         qmrmm: null

src/views/business/study/comp/tbbd/Sy.vue

@@ -195,7 +195,7 @@ export default {
     resetApprove() {
       this.formApprove = {
         id: null,
-        qmyy: '已审阅',
+        qmyy:  $t('page.business.study.studyFormFill.ysy'),
         remark: '',
         qmrmm: '',
       }

src/views/business/study/comp/tbbd/Xq.vue

@@ -124,7 +124,7 @@ export default {
       openApprove: false,
       formApprove: {
         id: null,
-        qmyy: '创建记录',
+        qmyy:  $t('page.business.study.studyFormFill.cjjl'),
         remark: '',
         qmrmm: '',
       },

src/views/business/study/comp/ytbd/Bj.vue

@@ -84,8 +84,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.fzrsh')" prop="fzrsh">
               <el-radio-group v-model="form.fzrsh">
-                <el-radio :label="10">是</el-radio>
-                <el-radio :label="1">否</el-radio>
+                <el-radio :label="$t('page.business.study.studyFormPre.yes')">是</el-radio>
+                <el-radio :label="$t('page.business.study.studyFormPre.no')">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -236,8 +236,7 @@ export default {
         studyFormPre_info({ id: row.id }).then(response => {
           this.form = response.data
           this.templateData = deepClone(this.form)
-
-          this.form.qmyy = '制作提交预制表单'
+          this.form.qmyy =  this.$t('page.business.study.studyFormPre.zztjyzbd')
           this.$modal.closeLoading()
         }).finally(() => {
           this.$modal.closeLoading()

src/views/business/study/comp/ytbd/Sh.vue

@@ -139,7 +139,7 @@ export default {
       openApprove: false,
       formApprove: {
         id: null,
-        qmyy: '审核通过',
+        qmyy: this.$t('page.business.study.studyFormPre.shtg'),
         remark: '',
         qmrmm: '',
       },
@@ -153,7 +153,7 @@ export default {
       openReject: false,
       formReject: {
         id: null,
-        qmyy: '审核拒绝',
+        qmyy: this.$t('page.business.study.studyFormPre.shjj'),
         remark: '',
         qmrmm: '',
       },

src/views/business/study/comp/ytbd/Xq.vue

@@ -116,7 +116,7 @@ export default {
       openApprove: false,
       formApprove: {
         id: null,
-        qmyy: '创建记录',
+        qmyy: this.$t('page.business.study.studyFormPre.cjjl'),
         remark: '',
         qmrmm: '',
       },