diff --git a/src/api/business/gsp/gsp.js b/src/api/business/gsp/gsp.js
new file mode 100644
index 0000000..4f5ac2d
--- /dev/null
+++ b/src/api/business/gsp/gsp.js
@@ -0,0 +1,201 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/system/business/gsp/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/gsp/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+// 详情
+export function info(query) {
+  return request({
+    url: '/system/business/gsp/info',
+    method: 'get',
+    params: query
+  })
+}
+// 保存
+export function save(data) {
+  return request({
+    url: '/system/business/gsp/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 编辑
+export function edit(data) {
+  return request({
+    url: '/system/business/gsp/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核编辑
+export function shbj(data) {
+  return request({
+    url: '/system/business/gsp/shbj',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存
+export function xgkc(data) {
+  return request({
+    url: '/system/business/gsp/xgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核修改库存
+export function shxgkc(data) {
+  return request({
+    url: '/system/business/gsp/shxgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 解锁
+export function js(data) {
+  return request({
+    url: '/system/business/gsp/js',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 锁定
+export function sd(data) {
+  return request({
+    url: '/system/business/gsp/sd',
+    method: 'post',
+    data: data
+  })
+}
+
+
+//批量锁定
+export function plsd(data) {
+  return request({
+    url: '/system/business/gsp/plsd',
+    method: 'post',
+    data: data
+  })
+}
+
+//处置容器
+export function cz(data) {
+  return request({
+    url: '/system/business/gsp/cz',
+    method: 'post',
+    data: data
+  })
+}
+
+//批量处置
+export function plcz(data) {
+  return request({
+    url: '/system/business/gsp/plcz',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+//归档
+export function gd(data) {
+  return request({
+    url: '/system/business/gsp/gd',
+    method: 'post',
+    data: data
+  })
+}
+
+//批量归档
+export function plgd(data) {
+  return request({
+    url: '/system/business/gsp/plgd',
+    method: 'post',
+    data: data
+  })
+}
+//发放
+export function ff(data) {
+  return request({
+    url: '/system/business/gsp/ff',
+    method: 'post',
+    data: data
+  })
+}
+//批量发放
+export function plff(data) {
+  return request({
+    url: '/system/business/gsp/plff',
+    method: 'post',
+    data: data
+  })
+}
+
+//钥匙发放
+export function ysff(data) {
+  return request({
+    url: '/system/business/gsp/ysff',
+    method: 'post',
+    data: data
+  })
+}
+
+//归还
+export function gh(data) {
+  return request({
+    url: '/system/business/gsp/gh',
+    method: 'post',
+    data: data
+  })
+}
+
+//台账列表
+export function tzList(query) {
+  return request({
+    url: '/system/business/gsp/tzList',
+    method: 'get',
+    params: query
+  })
+}
+
+//解档
+export function jd(data) {
+  return request({
+    url: '/system/business/gsp/jd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 借阅
+export function jy(data) {
+  return request({
+    url: '/system/business/gsp/jy',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/api/business/gsp/gspFfjl.js b/src/api/business/gsp/gspFfjl.js
new file mode 100644
index 0000000..38886e8
--- /dev/null
+++ b/src/api/business/gsp/gspFfjl.js
@@ -0,0 +1,91 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/system/business/gspFfjl/list',
+    method: 'get',
+    params: query
+  })
+}
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/gspFfjl/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详情
+export function info(query) {
+  return request({
+    url: '/system/business/gspFfjl/info',
+    method: 'get',
+    params: query
+  })
+}
+// 解锁
+export function js(data) {
+  return request({
+    url: '/system/business/gspFfjl/js',
+    method: 'post',
+    data: data
+  })
+}
+// 锁定
+export function sd(data) {
+  return request({
+    url: '/system/business/gspFfjl/sd',
+    method: 'post',
+    data: data
+  })
+}
+// 锁定
+export function plsd(data) {
+  return request({
+    url: '/system/business/gspFfjl/plsd',
+    method: 'post',
+    data: data
+  })
+}
+//归档
+export function gd(data) {
+  return request({
+    url: '/system/business/gspFfjl/gd',
+    method: 'post',
+    data: data
+  })
+}
+//解档
+export function jd(data) {
+  return request({
+    url: '/system/business/gspFfjl/jd',
+    method: 'post',
+    data: data
+  })
+}
+//借阅
+export function jy(data) {
+  return request({
+    url: '/system/business/gspFfjl/jy',
+    method: 'post',
+    data: data
+  })
+}
+//归档
+export function plgd(data) {
+  return request({
+    url: '/system/business/gspFfjl/plgd',
+    method: 'post',
+    data: data
+  })
+}
+//加签
+export function jq(data) {
+  return request({
+    url: '/system/business/gspFfjl/jq',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/api/business/gsp/gspRkjl.js b/src/api/business/gsp/gspRkjl.js
new file mode 100644
index 0000000..16a100b
--- /dev/null
+++ b/src/api/business/gsp/gspRkjl.js
@@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/system/business/gspRkjl/list',
+    method: 'get',
+    params: query
+  })
+}
+// 新增
+export function xz(data) {
+  return request({
+    url: '/system/business/gspRkjl/xz',
+    method: 'post',
+    data: data
+  })
+}
+// 编辑
+export function bj(data) {
+  return request({
+    url: '/system/business/gspRkjl/bj',
+    method: 'post',
+    data: data
+  })
+}
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/gspRkjl/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详情
+export function info(query) {
+  return request({
+    url: '/system/business/gspRkjl/info',
+    method: 'get',
+    params: query
+  })
+}
+// 解锁
+export function js(data) {
+  return request({
+    url: '/system/business/gspRkjl/js',
+    method: 'post',
+    data: data
+  })
+}
+// 锁定
+export function sd(data) {
+  return request({
+    url: '/system/business/gspRkjl/sd',
+    method: 'post',
+    data: data
+  })
+}
+// 锁定
+export function plsd(data) {
+  return request({
+    url: '/system/business/gspRkjl/plsd',
+    method: 'post',
+    data: data
+  })
+}
+//归档
+export function gd(data) {
+  return request({
+    url: '/system/business/gspRkjl/gd',
+    method: 'post',
+    data: data
+  })
+}
+//解档
+export function jd(data) {
+  return request({
+    url: '/system/business/gspRkjl/jd',
+    method: 'post',
+    data: data
+  })
+}
+//借阅
+export function jy(data) {
+  return request({
+    url: '/system/business/gspRkjl/jy',
+    method: 'post',
+    data: data
+  })
+}
+//归档
+export function plgd(data) {
+  return request({
+    url: '/system/business/gspRkjl/plgd',
+    method: 'post',
+    data: data
+  })
+}
+//加签
+export function jq(data) {
+  return request({
+    url: '/system/business/gspRkjl/jq',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/api/business/sj/sj.js b/src/api/business/sj/sj.js
index 5214e47..dfe0e32 100644
--- a/src/api/business/sj/sj.js
+++ b/src/api/business/sj/sj.js
@@ -18,7 +18,7 @@ export function sj_info(query) {
   })
 }
 
-// 保存试剂库存
+// 保存试剂
 export function sj_save(data) {
   return request({
     url: '/system/business/sj/save',
diff --git a/src/lang/en.js b/src/lang/en.js
index d397309..be197b3 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -41,6 +41,9 @@ import mjy from './en/business/resource/mjy'
 import gyzj from './en/business/resource/gyzj'
 // 试剂库存
 import sj from './en/business/resource/sj'
+// 供试品
+import gsp from './en/business/resource/gsp'
+
 export default {
   system: {
     name: 'WestChina-Frontier PharmaTech ELN',
@@ -129,7 +132,8 @@ export default {
         mjy: mjy,
         yq: yq,
         sj: sj,
-        gyzj: gyzj
+        gyzj: gyzj,
+        gsp: gsp
       },
       study: {
         study: study,
diff --git a/src/lang/en/business/resource/gsp.js b/src/lang/en/business/resource/gsp.js
new file mode 100644
index 0000000..7457099
--- /dev/null
+++ b/src/lang/en/business/resource/gsp.js
@@ -0,0 +1,117 @@
+export default {
+  gspgl: '供试品管理',
+  gsprkjl: '供试品入库记录',
+  ffhsjl: '发放回收记录',
+  gspxq: '供试品详情',
+  gxwzk: '更新物资库',
+  mc: '名称',
+  bh: '编号',
+  ph: '批号',
+  gg: '规格',
+  jyzt: '借阅状态',
+  zjzt: '制剂状态',
+  jlzt: '记录状态',
+  sxrq: '失效日期',
+  yxq: '有效期',
+  jsrq: '接收日期',
+  zysx: '注意事项',
+  nd: '浓度',
+  nddw: '浓度单位',
+  kcl: '库存量',
+  kc: '库存',
+  kcdw: '库存单位',
+  zcg: '暂存柜',
+  cctj: '存储条件',
+  ccwz: '存储位置',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  ckjz: '出库净重',
+  rkjz: '入库净重',
+  syl: '使用量',
+  lqr1: '领取人1',
+  lqr2: '领取人2',
+  kgy1: '库管员1',
+  kgy2: '库管员2',
+
+  plff: '批量发放',
+  plcz: '批量处置',
+  ysff: '钥匙发放',
+  plsd: '批量锁定',
+  plgd: '批量归档',
+  lock: '锁定',
+  unlock: '解锁',
+  detail: '详情',
+  guidang: '归档',
+  jiedang: '解档',
+  jieyue: '借阅',
+  guihuan: '归还',
+  fafang: '发放',
+  ysff: '钥匙发放',
+  cz: '处置',
+  czrq: '处置容器',
+  czyj: '处置药剂',
+  yuanyin: '原因',
+  xgkc: '修改库存',
+  shxgkc: '审核修改库存',
+  shbj: '审核编辑',
+  xgqkc: '修改前库存',
+  xghkc: '修改后库存',
+  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: '加签',
+
+  rkwz: '入库位置',
+  rktj: '入库条件',
+  zytj: '转移条件',
+  rkmz: '入库毛重',
+  jsl: '减少量',
+  syl: '使用量',
+  ghr1Id: '归还人1',
+  ghr2Id: '归还人2',
+  jsr1Id: '库管员1',
+  jsr2Id: '库管员2',
+  tz: '台账',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  gdsqr: '归档申请人',
+  cjsj: '创建时间',
+  rkl: '入库量',
+  jysj: '借阅时间',
+  mjyxq: '麻精药详情',
+  ffjlxq: '发放回收记录详情',
+  dr: '导入',
+  gd: '归档',
+}
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 767972c..0656745 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -41,6 +41,8 @@ import mjy from './zh/business/resource/mjy'
 import gyzj from './zh/business/resource/gyzj'
 // 试剂库存
 import sj from './zh/business/resource/sj'
+// 供试品
+import gsp from './zh/business/resource/gsp'
 export default {
   system: {
     name: '华西海圻ELN系统',
@@ -126,7 +128,8 @@ export default {
         mjy: mjy,
         yq: yq,
         sj: sj,
-        gyzj: gyzj
+        gyzj: gyzj,
+        gsp: gsp
       },
       study: {
         study: study,
diff --git a/src/lang/zh/business/resource/gsp.js b/src/lang/zh/business/resource/gsp.js
new file mode 100644
index 0000000..d0216ef
--- /dev/null
+++ b/src/lang/zh/business/resource/gsp.js
@@ -0,0 +1,118 @@
+export default {
+  gspgl: '供试品管理',
+  gsprkjl: '供试品入库记录',
+  ffhsjl:'发放回收记录',
+  gspxq: '供试品详情',
+
+  gxwzk: '更新物资库',
+  mc: '名称',
+  bh: '编号',
+  ph: '批号',
+  gg: '规格',
+  jyzt: '借阅状态',
+  zjzt: '制剂状态',
+  jlzt: '记录状态',
+  sxrq: '失效日期',
+  yxq: '有效期',
+  jsrq: '接收日期',
+  zysx: '注意事项',
+  nd: '浓度',
+  nddw: '浓度单位',
+  kcl: '库存量',
+  kc: '库存',
+  kcdw: '库存单位',
+  zcg: '暂存柜',
+  cctj: '存储条件',
+  ccwz: '存储位置',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  ckjz: '出库净重',
+  rkjz: '入库净重',
+  syl: '使用量',
+  lqr1: '领取人1',
+  lqr2: '领取人2',
+  kgy1: '库管员1',
+  kgy2: '库管员2',
+
+  plff: '批量发放',
+  plcz: '批量处置',
+  ysff: '钥匙发放',
+  plsd: '批量锁定',
+  plgd: '批量归档',
+  lock: '锁定',
+  unlock: '解锁',
+  detail: '详情',
+  guidang: '归档',
+  jiedang: '解档',
+  jieyue: '借阅',
+  guihuan: '归还',
+  fafang: '发放',
+  ysff: '钥匙发放',
+  cz: '处置',
+  czrq: '处置容器',
+  czyj: '处置药剂',
+  yuanyin: '原因',
+  xgkc: '修改库存',
+  xgqkc: '修改前库存',
+  xghkc: '修改后库存',
+  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: '加签',
+
+  rkwz: '入库位置',
+  rktj: '入库条件',
+  zytj: '转移条件',
+  rkmz: '入库毛重',
+  jsl: '减少量',
+  syl: '使用量',
+  ghr1Id: '归还人1',
+  ghr2Id: '归还人2',
+  jsr1Id: '库管员1',
+  jsr2Id: '库管员2',
+  tz: '台账',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  gdsqr: '归档申请人',
+  cjsj: '创建时间',
+  rkl: '入库量',
+  jysj: '借阅时间',
+  mjyxq: '麻精药详情',
+  ffjlxq: '发放回收记录详情',
+  dr: '导入',
+  gd: '归档',
+}
diff --git a/src/views/business/comps/select/BusinessSelect.vue b/src/views/business/comps/select/BusinessSelect.vue
index 3ddbfa9..754fd24 100644
--- a/src/views/business/comps/select/BusinessSelect.vue
+++ b/src/views/business/comps/select/BusinessSelect.vue
@@ -22,7 +22,7 @@ export default {
   components: {},
   props: {
     dictType: {
-      type: String,
+      type: [Number, String , Array],
       default: ''
     },
     value: {
diff --git a/src/views/business/resource/gsp/comps/ffjl/Gd.vue b/src/views/business/resource/gsp/comps/ffjl/Gd.vue
index ddd40d1..81430cd 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Gd.vue
@@ -1,18 +1,18 @@
 G<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.gsp.gd')" :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 :style="isBatch ? 'display:block' : 'display:none'">
-          <el-row style="margin:10px 0px;">
+          <!-- <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
          <div v-if="!isBatch">
-          <el-row>
+          <!-- <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
@@ -27,7 +27,7 @@ G<template>
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
         <el-row>
           <el-col :span="24">
@@ -71,7 +71,7 @@ G<template>
 </template>
 
 <script>
-import { gd, plgd } from "@/api/business/mjy/mjyFfjl"
+import { gd, plgd } from "@/api/business/gsp/gspFfjl"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jd.vue b/src/views/business/resource/gsp/comps/ffjl/Jd.vue
index 69be597..8b10fef 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jd.vue
@@ -61,7 +61,7 @@ G<template>
 </template>
 
 <script>
-import { jd, jdBatch } from "@/api/business/mjy/mjyFfjl"
+import { jd, jdBatch } from "@/api/business/gsp/gspFfjl"
 import { mapGetters } from 'vuex'
 
 export default {
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue
index 6949d9e..1542ef8 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jq.vue
@@ -3,7 +3,7 @@ G<template>
     <!-- 加签弹窗 -->
     <el-dialog :title="$t('page.business.resource.mjy.jiaqian')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-row>
+          <!-- <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
@@ -18,7 +18,7 @@ G<template>
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -61,7 +61,7 @@ G<template>
 </template>
 
 <script>
-import { jq } from "@/api/business/mjy/mjyFfjl"
+import { jq } from "@/api/business/gsp/gspFfjl"
 import { mapGetters } from 'vuex'
 
 export default {
diff --git a/src/views/business/resource/gsp/comps/ffjl/Js.vue b/src/views/business/resource/gsp/comps/ffjl/Js.vue
index b7bbcb2..46254ce 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Js.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Js.vue
@@ -61,7 +61,7 @@ G<template>
 </template>
 
 <script>
-import { js } from "@/api/business/mjy/mjyFfjl"
+import { js } from "@/api/business/gsp/gspFfjl"
 import { mapGetters } from 'vuex'
 
 export default {
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jy.vue b/src/views/business/resource/gsp/comps/ffjl/Jy.vue
index 0818f2c..cf63100 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jy.vue
@@ -72,7 +72,7 @@ G<template>
 </template>
 
 <script>
-import { jy } from "@/api/business/mjy/mjyFfjl"
+import { jy } from "@/api/business/gsp/gspFfjl"
 import { mapGetters } from 'vuex'
 
 export default {
diff --git a/src/views/business/resource/gsp/comps/ffjl/Sd.vue b/src/views/business/resource/gsp/comps/ffjl/Sd.vue
index 9664b9b..dd7ec79 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Sd.vue
@@ -5,14 +5,14 @@ G<template>
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-          <el-row style="margin:10px 0px;">
+          <!-- <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
          <div v-if="!isBatch">
-          <el-row>
+          <!-- <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
@@ -27,7 +27,7 @@ G<template>
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
         <el-row>
           <el-col :span="24">
@@ -71,7 +71,7 @@ G<template>
 </template>
 
 <script>
-import { sd, plsd } from "@/api/business/mjy/mjyFfjl"
+import { sd, plsd } from "@/api/business/gsp/gspFfjl"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
diff --git a/src/views/business/resource/gsp/comps/ffjl/Xq.vue b/src/views/business/resource/gsp/comps/ffjl/Xq.vue
index 5a14337..3879ce9 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Xq.vue
@@ -11,7 +11,8 @@
         <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.ffjlxq') }}<img src="@/assets/images/detail-title.png" /></div>
+    <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.mjy.ffjlxq')
+      }}<img src="@/assets/images/detail-title.png" /></div>
     <div class="detail-content">
       <div class="content-left">
         <div class="content-title">
@@ -20,138 +21,124 @@
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.mc') }}</div>
+            <div class="left-title">{{ $t('page.business.resource.gsp.mc') }}</div>
             <el-input type="text" :value="form.mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.bh') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.bh') }}</div>
             <el-input type="text" :value="form.bh" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.sxrq') }}</div>
-            <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gsp.ph') }}</div>
+            <el-input type="text" :value="form.ph" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.nd') }}</div>
-            <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-            }}</template>
+            <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
+            <el-input type="text" :value="form.gg" maxlength="50" disabled>
+              <template slot="append">{{ form.ggdw }}</template>
             </el-input>
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.cctj') }}</div>
-            <el-input type="text" :value="form.cctj" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gsp.yxq') }}</div>
+            <el-input type="text" :value="form.yxq" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.ccwz') }}</div>
-            <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.gsp.cctj') }}</div>
+            <el-input type="text" :value="form.cctj" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.ckl') }}</div>
-            <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-            }}</template>
-            </el-input>
+            <div class="left-title">{{ $t('page.business.resource.gsp.jsrq') }}</div>
+            <el-input type="text" :value="form.jsrq" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.ckmz') }}</div>
-            <el-input type="text" :value="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-            }}</template>
-            </el-input>
+            <div class="right-title">{{ $t('page.business.resource.gsp.ffzytj') }}</div>
+            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.lqsj') }}</div>
-            <el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-            }}</template>
+            <div class="left-title">{{ $t('page.business.resource.gsp.ckl') }}</div>
+            <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
+                }}</template>
             </el-input>
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.md') }}</div>
-            <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
-          </div>
-        </div>
-        <div class="pal">
-          <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.ffzytj') }}</div>
-            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
-          </div>
-          <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.lqr1') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.lqr1') }}</div>
             <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.lqr2') }}</div>
+            <div class="left-title">{{ $t('page.business.resource.gsp.lqr2') }}</div>
             <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.ghr1Id') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.kgy1') }}</div>
             <el-input type="text" :value="form.ghr1Mc" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.ghr2Id') }}</div>
+            <div class="left-title">{{ $t('page.business.resource.gsp.kgy2') }}</div>
             <el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.ghzytj') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.ghzytj') }}</div>
             <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.rkmz') }}</div>
-            <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
-            }}</template>
+            <div class="left-title">{{ $t('page.business.resource.gsp.rkl') }}</div>
+            <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
+                }}</template>
             </el-input>
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.ffbz') }}</div>
-            <el-input type="text" :value="form.ffbz" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gsp.ffbz') }}</div>
+            <el-input type="text" :value="form.ffbz" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.ghbz') }}</div>
-            <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.gsp.ghbz') }}</div>
+            <el-input type="text" :value="form.ghbz" disabled />
           </div>
         </div>
 
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.ghbz') }}</div>
-            <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gsp.gdsqr') }}</div>
+            <el-input type="text" :value="form.gdsqrMc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.cjsj') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.cjsj') }}</div>
             <el-input type="text" :value="form.createTime" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.jlzt') }}</div>
+            <div class="left-title">{{ $t('page.business.resource.gsp.jlzt') }}</div>
             <el-select v-model="form.jlzt" disabled style="width: 100%;">
-              <el-option :label="$t('page.business.resource.jlzt.wsd')" :value="1" />
-              <el-option :label="$t('page.business.resource.jlzt.ysd')" :value="3" />
-              <el-option :label="$t('page.business.resource.jlzt.dgd')" :value="5" />
-              <el-option :label="$t('page.business.resource.jlzt.gd')" :value="7" />
-              <el-option :label="$t('page.business.resource.jlzt.djd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
             </el-select>
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.jyzt') }}</div>
+            <div class="right-title">{{ $t('page.business.resource.gsp.jyzt') }}</div>
             <el-select v-model="form.jyzt" disabled style="width: 100%;">
-              <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
-              <el-option :label="$t('page.business.resource.jyzt.djy')" :value="3" />
-              <el-option :label="$t('page.business.resource.jyzt.jyz')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
             </el-select>
           </div>
         </div>
@@ -164,14 +151,14 @@
         <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
         <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize"/>
+          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { info, jcgjList } from "@/api/business/mjy/mjyFfjl"
+import { info, jcgjList } from "@/api/business/gsp/gspFfjl"
 import JcgjList from "@/views/business/comps/common/JcgjList";
 
 export default {
diff --git a/src/views/business/resource/gsp/comps/ffjlList.vue b/src/views/business/resource/gsp/comps/ffjlList.vue
index 373f3e8..cec1a92 100644
--- a/src/views/business/resource/gsp/comps/ffjlList.vue
+++ b/src/views/business/resource/gsp/comps/ffjlList.vue
@@ -7,49 +7,41 @@
           <el-row>
             <el-col :span="24">
               <!-- 名称 -->
-              <el-form-item :label="$t('page.business.resource.mjy.mc') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'">
                 <el-input v-model="queryParams.mc" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 编号 -->
-              <el-form-item :label="$t('page.business.resource.mjy.bh') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'">
                 <el-input v-model="queryParams.bh" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 目的 -->
-              <el-form-item :label="$t('page.business.resource.mjy.md') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.md') + '：'">
                 <el-input v-model="queryParams.mdId" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
-              <el-form-item :label="$t('page.business.resource.mjy.jlzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.jlzt') + '：'">
                 <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
-                  <el-option :label="$t('page.business.resource.jlzt.wsd')" :value="1" />
-                  <el-option :label="$t('page.business.resource.jlzt.ysd')" :value="3" />
-                  <el-option :label="$t('page.business.resource.jlzt.dgd')" :value="5" />
-                  <el-option :label="$t('page.business.resource.jlzt.gd')" :value="7" />
-                  <el-option :label="$t('page.business.resource.jlzt.djd')" :value="9" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
                 </el-select>
               </el-form-item>
               <!-- 借阅状态 -->
-              <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'">
                 <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
-                  <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
-                  <el-option :label="$t('page.business.resource.jyzt.djy')" :value="3" />
-                  <el-option :label="$t('page.business.resource.jyzt.jyz')" :value="5" />
+                  <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+                  <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+                  <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
                 </el-select>
               </el-form-item>
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <!-- 出库日期 -->
+               <!-- 出库日期 -->
               <el-form-item :label="$t('page.business.resource.mjy.cksj') + '：'">
                 <el-date-picker v-model="daterangeCk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
@@ -61,6 +53,10 @@
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
               </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -86,89 +82,83 @@
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" fixed="left"   width="55" align="center" :selectable="checkSelectable" />
-          <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+          <el-table-column type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" />
+          <el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
+          <el-table-column :label="$t('page.business.resource.gsp.bh')" align="center" prop="bh"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="mdMc"
+          <el-table-column :label="$t('page.business.resource.gsp.md')" align="center" prop="mdMc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.zytj')" align="center" prop="ffzytj"
+          <el-table-column :label="$t('page.business.resource.gsp.zytj')" align="center" prop="ffzytj"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.cksj')" align="center" prop="ffrq" width="150px" />
-          <el-table-column :label="$t('page.business.resource.mjy.rksj')" align="center" prop="ghrq" width="150px" />
-          <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.gsp.cksj')" align="center" prop="ffrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.rksj')" align="center" prop="ghrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.ckl')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.ckmz }} {{ scope.row.ckmzdw }}
+              {{ scope.row.ckl }} {{ scope.row.ckdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.rkmz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.gsp.rkl')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
+              {{ scope.row.rkl }} {{ scope.row.rkldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.syl')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.gsp.syl')" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.syl }} {{ scope.row.syldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
+          <el-table-column :label="$t('page.business.resource.gsp.lqr1')" align="center" prop="lqr1Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
+          <el-table-column :label="$t('page.business.resource.gsp.lqr2')" align="center" prop="lqr2Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.kgy1')" align="center" prop="jsr1Mc"
+          <el-table-column :label="$t('page.business.resource.gsp.kgy1')" align="center" prop="jsr1Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.kgy2')" align="center" prop="jsr2Mc"
+          <el-table-column :label="$t('page.business.resource.gsp.kgy2')" align="center" prop="jsr2Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.zcg')" align="center" prop="zcgMc"
+          <el-table-column :label="$t('page.business.resource.gsp.zcg')" align="center" prop="zcgMc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.jlzt')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.gsp.jlzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
-              <span v-if="scope.row.jlzt == 1">{{ $t('page.business.resource.jlzt.wsd') }}</span>
-              <span v-if="scope.row.jlzt == 3">{{ $t('page.business.resource.jlzt.ysd') }}</span>
-              <span v-if="scope.row.jlzt == 5">{{ $t('page.business.resource.jlzt.dgd') }}</span>
-              <span v-if="scope.row.jlzt == 7">{{ $t('page.business.resource.jlzt.gd') }}</span>
-              <span v-if="scope.row.jlzt == 9">{{ $t('page.business.resource.jlzt.djd') }}</span>
+              <span v-if="scope.row.jlzt == 1">{{ $t('page.business.resource.resource.jlzt.wsd') }}</span>
+              <span v-if="scope.row.jlzt == 3">{{ $t('page.business.resource.resource.jlzt.ysd') }}</span>
+              <span v-if="scope.row.jlzt == 5">{{ $t('page.business.resource.resource.jlzt.dgd') }}</span>
+              <span v-if="scope.row.jlzt == 7">{{ $t('page.business.resource.resource.jlzt.gd') }}</span>
+              <span v-if="scope.row.jlzt == 9">{{ $t('page.business.resource.resource.jlzt.djd') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.gsp.jyzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
-              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.resource.jyzt.jyz') }}</span>
+              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.resource.resource.jyzt.jyz') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
-               <!-- 加签 -->
-              <el-button v-if="scope.row.jlzt == 1 " type="text"
-                @click="handleJq(scope.row)" v-hasPermi="['business:resource:mjy:ffjljq']">{{
-                  $t('page.business.resource.mjy.jiaqian') }}</el-button>
+              <!-- 加签 -->
+              <el-button v-if="scope.row.jlzt == 1" type="text" @click="handleJq(scope.row)">{{
+                  $t('page.business.resource.gsp.jiaqian') }}</el-button>
               <!-- 详情 -->
               <el-button v-if="scope.row.jlzt == 1 || scope.row.jlzt == 3 || scope.row.jlzt == 7" type="text"
-                @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:ffjlxq']">{{
-                  $t('page.business.resource.mjy.detail') }}</el-button>
+                @click="handleXq(scope.row)" >{{
+                  $t('page.business.resource.gsp.detail') }}</el-button>
               <!-- 锁定 -->
-              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjlsd']">{{
-                  $t('page.business.resource.mjy.lock') }}</el-button>
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)">{{
+                  $t('page.business.resource.gsp.lock') }}</el-button>
               <!-- 解锁 -->
-              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjljs']">{{
-                  $t('page.business.resource.mjy.unlock') }}</el-button>
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)">{{
+                  $t('page.business.resource.gsp.unlock') }}</el-button>
               <!-- 归档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjlgd']">{{
-                  $t('page.business.resource.mjy.guidang') }}</el-button>
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)">{{
+                  $t('page.business.resource.gsp.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjljd']">{{
-                  $t('page.business.resource.mjy.jiedang') }}</el-button>
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)">{{
+                  $t('page.business.resource.gsp.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7&&scope.row.jyzt == 1" @click="handleJy(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjljy']">{{
-                  $t('page.business.resource.mjy.jieyue') }}</el-button>
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)">{{
+                  $t('page.business.resource.gsp.jieyue') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -186,7 +176,7 @@
       <!-- 借阅 -->
       <Jy key="Jy" ref="Jy" @callback="handleQuery" />
       <!-- 借阅 -->
-      <Xq key="Xq" v-show="showDetail" ref="Xq" @callback="closeXq"/>
+      <Xq key="Xq" v-show="showDetail" ref="Xq" @callback="closeXq" />
       <!-- 加签 -->
       <Jq key="Jq" ref="Jq" @callback="handleQuery" />
     </div>
@@ -194,7 +184,7 @@
 </template>
 
 <script>
-import { list } from "@/api/business/mjy/mjyFfjl"
+import { list } from "@/api/business/gsp/gspFfjl"
 import Sd from "./ffjl/Sd";
 import Jy from "./ffjl/Jy";
 import Js from "./ffjl/Js";
@@ -211,7 +201,7 @@ export default {
       daterangeCk: [],
       daterangeRk: [],
       loading: true,
-      showDetail:false,
+      showDetail: false,
       single: true,
       multiple: true,
       total: 0,
@@ -262,15 +252,15 @@ export default {
     handlePlsd() {
       this.$refs.Sd.showBatch(this.selectList)
     },
-      closeXq(){
-      this.showDetail=false
-      this.$emit('showDetail',this.showDetail)
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
       this.handleQuery()
     },
     //详情
     handleXq(row) {
-      this.showDetail=true
-      this.$emit('showDetail',this.showDetail)
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
     //归档
diff --git a/src/views/business/resource/gsp/comps/mjy/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue
similarity index 58%
rename from src/views/business/resource/gsp/comps/mjy/Bj.vue
rename to src/views/business/resource/gsp/comps/gsp/Bj.vue
index dcc33f7..ce41131 100644
--- a/src/views/business/resource/gsp/comps/mjy/Bj.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Bj.vue
@@ -1,49 +1,73 @@
-G<template>
+<template>
   <div>
     <!-- 编辑弹窗 -->
     <el-dialog :title="$t('form.edit')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
+          <!-- 名称 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
               <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
+          <!-- 编号 -->
           <el-col :span="12">
-            <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 :label="$t('page.business.resource.gsp.bh')" prop="bh">
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <!-- 批号 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.nd')" prop="nd">
-              <el-input type="number" v-model="form.nd" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="ph">
+              <el-input type="text" v-model="form.ph" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.nddw')" prop="nddw">
-              <el-input type="text" v-model="form.nddw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+          <!-- 规格 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
+              <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
+          <!-- 规格单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.ggdw"
+              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
+          </el-col>
         </el-row>
         <el-row>
+          <!-- 有效期 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <!-- 存储条件 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.sxrq')" prop="sxrq">
-              <el-input type="text" v-model="form.sxrq" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="system_business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <!-- 接收日期 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
-              <el-input type="text" v-model="form.cctj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="jsrq">
+              <el-date-picker v-model="form.jsrq" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
-              <el-input type="text" v-model="form.ccwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+        </el-row>
+        <el-row>
+          <!-- 注意事项 -->
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.zysx')" prop="zysx">
+              <el-input type="textarea" :rows="2" v-model="form.zysx" maxlength="500"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -63,8 +87,9 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -87,13 +112,13 @@ G<template>
 </template>
 
 <script>
-import { bj } from "@/api/business/mjy/mjy"
+import { edit, info } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Bj",
-  components: { SelectList },
+  components: { BusinessSelect },
   data() {
     return {
       open: false,
@@ -109,17 +134,27 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        nd: [{
+        ph: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        gg: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        nddw: [{
+        kc: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        sxrq: [{
+        yxq: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsrq: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -129,7 +164,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        ccwz: [{
+        zysx: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -155,36 +190,22 @@ export default {
     },
     reset() {
       this.form = {
-        id: null,
-        mc: null,
-        bh: null,
-        nd: null,
-        nddw: null,
-        sxrq: null,
-        cctj: null,
-        ccwz: null,
-        qmrmm: null,
         qmyy: '编辑',
-        bjbz: ''
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.form.nd = row.nd
-      this.form.nddw = row.nddw
-      this.form.sxrq= row.sxrq
-      this.form.cctj = row.cctj
-      this.form.ccwz = row.ccwz
+      info({id: row.id}).then(response => {
+        this.form = response.data;
+      })
+
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          bj(this.form).then(response => {
+          edit(this.form).then(response => {
             this.open = false
             this.$emit('callback')
           })
diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue
new file mode 100644
index 0000000..3b31aec
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue
@@ -0,0 +1,160 @@
+G<template>
+  <div>
+    <!-- 处置供试品弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gsp.cz')" :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>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gsp.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.gsp.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>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gsp.czfs')" prop="czfs">
+                <BusinessSelect v-model="form.czfs" dictType="system_business_czfs"></BusinessSelect>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gsp.czl')" prop="czl">
+                <el-input type="number" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')">
+                  <template slot="append">{{ form.kcdw }}</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gsp.yuanyin')" prop="remark">
+                <el-input type="textarea" :rows="2" v-model="form.remark" maxlength="500"
+                  :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.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="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" 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 { cz } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+export default {
+  name: "GspCz",
+  components: { SelectList, BusinessSelect },
+  data() {
+    return {
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        czfs: [
+          { required: true, message: this.$t('page.business.resource.sj.sjczfs') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.sj.sjczfs') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+        ],
+        czl: [
+          { required: true, message: this.$t('page.business.resource.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        remark: [
+          { required: true, message: this.$t('page.business.resource.sj.yuanyin') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        qmrmm: [
+          { required: true, message: this.$t('form.signerPsw') + this.$t('form.notEmpty'), trigger: "change" },
+        ]
+
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        ids: null,
+        mc: null,
+        bh: null,
+        qmyy: '处置',
+        kcdw: '',
+        qmrmm: 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.form.kcdw = row.kcdw
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          cz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
new file mode 100644
index 0000000..c99bceb
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
@@ -0,0 +1,157 @@
+G<template>
+  <div>
+    <!-- 处置试剂弹窗 -->
+    <el-dialog :title="$t('page.business.resource.sj.cz')" :visible.sync="open" width="1200px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row style="margin:10px 0px;">
+          <el-col :span="24">
+            <el-table :data="selectList" border>
+              <el-table-column :label="$t('page.business.resource.sj.mc')" align="left" prop="mc"
+                :show-overflow-tooltip="true" width="120px" />
+              <el-table-column :label="$t('page.business.resource.sj.bh')" align="left" prop="bh"
+                :show-overflow-tooltip="true" width="120px" />
+              <el-table-column :label="$t('page.business.resource.sj.sjczfs')" align="center" width="250px">
+                <template slot-scope="scope">
+                  <BusinessSelect v-model="scope.row.czfs" dictType="system_business_czfs"></BusinessSelect>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.sj.yuanyin')" align="center">
+                <template slot-scope="scope">
+                  <el-input type="text" v-model="scope.row.czyy" maxlength="50"
+                    :placeholder="$t('form.placeholderInput')" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.sj.czl')" align="center">
+                <template slot-scope="scope">
+                  <el-input type="text" v-model="scope.row.czl" maxlength="50"
+                    :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw }}</template>
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('form.operate')" align="center" width="150px">
+                <template slot-scope="scope">
+                  <el-button type="text" @click="handleSc(scope.row)">{{
+                    $t('form.delete') }}</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" 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 { sj_plcz } from "@/api/business/sj/sj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+export default {
+  name: "CzBatch",
+  components: { SelectList, BusinessSelect },
+  data() {
+    return {
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        czfs: [
+          { required: true, message: this.$t('page.business.resource.sj.sjczfs') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.sj.sjczfs') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+        ],
+        czl: [
+          { required: true, message: this.$t('page.business.resource.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        remark: [
+          { required: true, message: this.$t('page.business.resource.sj.yuanyin') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        qmrmm: [
+          { required: true, message: this.$t('form.signerPsw') + this.$t('form.notEmpty'), trigger: "change" },
+        ]
+
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    // 删除
+    handleSc(row) {
+      const that = this
+      this.$modal.confirm(this.$t('form.confirmDelete')).then(() => {
+        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
+        if (_index > -1) {
+          that.selectList.splice(_index, 1)
+          that.form.ids = that.selectList.map(item => item.id)
+        }
+      }).catch(() => { })
+    },
+    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: '处置',
+        kcdw: '',
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          sj_plcz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue
similarity index 75%
rename from src/views/business/resource/gsp/comps/mjy/Ff.vue
rename to src/views/business/resource/gsp/comps/gsp/Ff.vue
index 8e607aa..d751267 100644
--- a/src/views/business/resource/gsp/comps/mjy/Ff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue
@@ -1,47 +1,41 @@
 G<template>
   <div>
     <!-- 发放弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.fafang')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gsp.fafang')" :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 :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
                   :show-overflow-tooltip="true" width="100px" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.gsp.bh')" align="left" prop="bh"
                   :show-overflow-tooltip="true" width="100px" />
-                <el-table-column :label="$t('page.business.resource.mjy.nd')" align="center">
+                <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph">
+                </el-table-column>
+                <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center" prop="gg">
                   <template slot-scope="scope">
-                    {{ scope.row.nd }}{{ scope.row.nddw }}
+                    {{ scope.row.gg }}{{ scope.row.ggdw }}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.sxrq')" align="center" prop="sxrq"
+                <el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq"
                   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"
+                <el-table-column :label="$t('page.business.resource.gsp.jsrq')" align="center" prop="jsrq"
                   width="130px" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center">
+                <el-table-column :label="$t('page.business.resource.gsp.ckjz')" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.kc }}{{ scope.row.kcdw }}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.zytj')" align="center" width="250px">
+                <el-table-column :label="$t('page.business.resource.gsp.zysx')" align="center" prop="zysx"
+                  width="130px" />
+                <el-table-column :label="$t('page.business.resource.gsp.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.zytj" maxlength="50"
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" width="250px">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.ckmz" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"><template slot="append">{{ scope.row.ckmzdw
-                      }}</template>
-                    </el-input>
-                  </template>
-                </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.xmId" maxlength="50"
@@ -67,12 +61,12 @@ G<template>
         <div v-if="!isBatch">
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')">
+              <el-form-item :label="$t('page.business.resource.gsp.mc')">
                 <el-input type="text" v-model="form.mc" maxlength="50" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')">
+              <el-form-item :label="$t('page.business.resource.gsp.bh')">
                 <el-input type="text" v-model="form.bh" maxlength="50" disabled />
               </el-form-item>
             </el-col>
@@ -80,13 +74,13 @@ G<template>
 
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.sxrq')">
-                <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+              <el-form-item :label="$t('page.business.resource.gsp.ph')">
+                <el-input type="text" v-model="form.ph" maxlength="50" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.nd')">
-                <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
+              <el-form-item :label="$t('page.business.resource.gsp.gg')">
+                <el-input type="text" v-model="form.gg" maxlength="50" disabled> <template slot="append">{{ form.ggdw
                 }}</template>
                 </el-input>
               </el-form-item>
@@ -94,40 +88,46 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.cctj')">
-                <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
+              <el-form-item :label="$t('page.business.resource.gsp.yxq')">
+                <el-input type="text" v-model="form.yxq" maxlength="50" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.ccwz')">
-                <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
+              <el-form-item :label="$t('page.business.resource.gsp.cctj')">
+                <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
-                <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
+              <el-form-item :label="$t('page.business.resource.gsp.jsrq')">
+                <el-input type="text" v-model="form.jsrq" maxlength="50" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gsp.ckjz')" >
+                <el-input type="text" v-model="form.kc" maxlength="50" disabled ><template slot="append">{{ form.kcdw
                 }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.zytj')" prop="zytj">
-                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gsp.zysx')">
+                <el-input type="textarea" v-model="form.zysx" maxlength="50" disabled />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.md')" prop="xmId">
-                <el-input type="text" v-model="form.xmId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.resource.gsp.zytj')" prop="zytj">
+                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.ckmz')" prop="ckmz">
-                <el-input type="number" v-model="form.ckmz" maxlength="20" :placeholder="$t('form.placeholderInput')">
-                  <template slot="append">{{ form.ckmzdw }}</template>
+              <el-form-item :label="$t('page.business.resource.gsp.md')" prop="mdIds">
+                <el-input type="text" v-model="form.mdIds" maxlength="20" :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
             </el-col>
@@ -145,12 +145,12 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.lqr1')" prop="lqr1Id">
-              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
+            <el-form-item :label="$t('page.business.resource.gsp.lqr1')" prop="lqr1Id">
+              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" :name="form.lqr1Mc" @change="userSelectLqr1" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.lqr1')+$t('form.password')" prop="lqr1mm">
+            <el-form-item :label="$t('page.business.resource.gsp.lqr1')+$t('form.password')" prop="lqr1mm">
               <el-input type="password" v-model="form.lqr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -158,12 +158,12 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.lqr2')" prop="lqr2Id">
-              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
+            <el-form-item :label="$t('page.business.resource.gsp.lqr2')" >
+              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" :name="form.lqr2Mc" @change="userSelectLqr2"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.lqr2')+$t('form.password')" prop="lqr2mm">
+            <el-form-item :label="$t('page.business.resource.gsp.lqr2')+$t('form.password')" >
               <el-input type="password" v-model="form.lqr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -172,7 +172,7 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr1')" prop="ffr1Id">
-              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id" />
+              <SelectDeptUser v-model="form.ffr1Id" :name="form.ffr1Mc" key="ffr1Id" @change="userSelectFfr1" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -185,7 +185,7 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr2')" prop="ffr2Id">
-              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" />
+              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" :name="form.ffr2Mc" @change="userSelectFfr2" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -213,7 +213,7 @@ G<template>
 </template>
 
 <script>
-import { ff, plff } from "@/api/business/mjy/mjy"
+import { ff, plff } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
@@ -229,12 +229,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        ffr2mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ffr2Id: [{
+        mdIds: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -249,21 +244,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         lqr1mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         lqr1Id: [{
           required: true,
           message: ' ',
@@ -306,12 +291,28 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName', 'id'
     ]),
   },
   created() {
   },
   methods: {
+    userSelectLqr1(val) {
+      this.form.lqr1Id = val.id;
+      this.form.lqr1Mc = val.name;
+    },
+    userSelectLqr2(val) {
+      this.form.lqr2Id = val.id;
+      this.form.lqr2Mc = val.name;
+    },
+    userSelectFfr1(val) {
+      this.form.ffr1Id = val.id
+      this.form.ffr1Mc = val.name
+    },
+    userSelectFfr2(val) {
+      this.form.ffr2Id = val.id
+      this.form.ffr2Mc = val.name
+    },
     handleSc(row) {
       const that = this
       this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
@@ -352,13 +353,15 @@ export default {
         bh: null,
         ckmzdw: null,
         zytj: null,
-        xmId: null,
+        mdIds: null,
         ckmz: null,
         lqr1Id: null,
+        lqr1Mc: null,
         lqr2Id: null,
         lqr1mm: null,
         lqr2mm: null,
-        ffr1Id: null,
+        ffr1Id: this.id,
+        ffr1Mc: this.nickName,
         ffr1mm: null,
         ffr2Id: null,
         ffr2mm: null,
@@ -377,15 +380,15 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
-      this.form.ckmzdw = row.kcdw
-
-      this.form.sxrq = row.sxrq
-      this.form.nd = row.nd
-      this.form.nddw = row.nddw
+      this.form.ph = row.ph
+      this.form.gg = row.gg
+      this.form.ggdw = row.ggdw
+      this.form.yxq = row.yxq
+      this.form.jsrq = row.jsrq
       this.form.cctj = row.cctj
-      this.form.ccwz = row.ccwz
-      this.form.ckl = row.ckl
-      this.form.ckldw = row.ckldw
+      this.form.kc = row.kc
+      this.form.kcdw = row.kcdw
+      this.form.zysx = row.zysx
       this.open = true
     },
     save() {
@@ -395,7 +398,7 @@ export default {
           if (this.isBatch) {
             params.list = this.selectList
             if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
+              this.$modal.msgError("请选择要操作的供试品")
             } else {
               plff(params).then(response => {
                 this.open = false
diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue
new file mode 100644
index 0000000..7f5eacd
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/Gd.vue
@@ -0,0 +1,132 @@
+G<template>
+  <div>
+    <!-- 归档弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gsp.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">
+
+        <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="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" 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 { gd, plgd } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Gd",
+  components: { SelectList },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  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: '申请归档',
+        qmrmm: 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) {
+            plgd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          } else {
+            gd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue
similarity index 56%
rename from src/views/business/resource/gsp/comps/mjy/Gh.vue
rename to src/views/business/resource/gsp/comps/gsp/Gh.vue
index 0baa6d6..911e0b8 100644
--- a/src/views/business/resource/gsp/comps/mjy/Gh.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Gh.vue
@@ -6,12 +6,12 @@ G<template>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.mc')">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')">
               <el-input type="text" v-model="form.mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.bh')">
+            <el-form-item :label="$t('page.business.resource.gsp.bh')">
               <el-input type="text" v-model="form.bh" maxlength="50" disabled />
             </el-form-item>
           </el-col>
@@ -19,13 +19,13 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.sxrq')">
-              <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gsp.ph')">
+              <el-input type="text" v-model="form.ph" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.nd')">
-              <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
+            <el-form-item :label="$t('page.business.resource.gsp.gg')">
+              <el-input type="text" v-model="form.gg" maxlength="50" disabled> <template slot="append">{{ form.ggdw
                   }}</template>
               </el-input>
             </el-form-item>
@@ -33,89 +33,53 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cctj')">
-              <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gsp.jsrq')">
+              <el-input type="text" v-model="form.jsrq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ccwz')">
-              <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
-              <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                  }}</template>
+            <el-form-item :label="$t('page.business.resource.gsp.ckjz')">
+              <el-input type="text" v-model="form.kc" maxlength="50" disabled>
+                <template slot="append">{{ form.kcdw }}</template>
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cksj')">
-              <el-input type="text" v-model="form.ffrq" maxlength="50" disabled />
-            </el-form-item>
-          </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ckmz')">
-              <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-                  }}</template>
-              </el-input>
+            <el-form-item :label="$t('page.business.resource.gsp.yxq')">
+              <el-input type="text" v-model="form.yxq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.md')">
-              <el-input type="text" v-model="form.mdIds" maxlength="50" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rkwz')" prop="rkwz">
-              <el-input type="text" v-model="form.rkwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rktj')" prop="rktj">
-              <el-input type="text" v-model="form.rktj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gsp.lqsj')">
+              <el-input type="text" v-model="form.ffrq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.zytj')" prop="ghzytj">
-              <el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gsp.md')">
+              <el-input type="text" v-model="form.md" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rkmz')" prop="rkmz">
-              <el-input type="number" v-model="form.rkmz" maxlength="50" @change="rklChange"
-                :placeholder="$t('form.placeholderInput')">
-                <template slot="append">{{ form.kcdw }}</template>
-              </el-input>
+            <el-form-item :label="$t('page.business.resource.gsp.zytj')" prop="ghzytj">
+              <el-input type="text" v-model="form.ghzytj" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsl')" prop="jsl">
-              <el-input type="number" v-model="form.jsl" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')">
-                <template slot="append">{{ form.kcdw }}</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.syl')" prop="syl">
-              <el-input type="number" v-model="form.syl" maxlength="50" :placeholder="$t('form.placeholderInput')">
+            <el-form-item :label="$t('page.business.resource.mjy.rkl')" prop="rkl">
+              <el-input type="text" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')">
                 <template slot="append">{{ form.kcdw }}</template>
               </el-input>
             </el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
@@ -130,11 +94,11 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ghr1Id')" prop="ghr1Id">
-              <SelectDeptUser v-model="form.ghr1Id" key="ghr1Id" />
+              <SelectDeptUser v-model="form.ghr1Id" key="ghr1Id" :name="form.ghr1Mc" @change="userSelectGhr1"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr1Id')+$t('form.password')" prop="ghr1mm">
+            <el-form-item :label="$t('page.business.resource.mjy.ghr1Id') + $t('form.password')" prop="ghr1mm">
               <el-input type="password" v-model="form.ghr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -142,12 +106,12 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id')" prop="ghr2Id">
-              <SelectDeptUser v-model="form.ghr2Id" key="ghr2Id" />
+            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id')">
+              <SelectDeptUser v-model="form.ghr2Id" key="ghr2Id" :name="form.ghr2Mc" @change="userSelectGhr2"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id')+$t('form.password')" prop="ghr2mm">
+            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id') + $t('form.password')">
               <el-input type="password" v-model="form.ghr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -156,11 +120,11 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.jsr1Id')" prop="jsr1Id">
-              <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
+              <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" :name="form.jsr1Mc" @change="userSelectJsr1" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id')+$t('form.password')" prop="jsr1mm">
+            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id') + $t('form.password')" prop="jsr1mm">
               <el-input type="password" v-model="form.jsr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -168,12 +132,12 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id')" prop="jsr2Id">
-              <SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" />
+            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id')">
+              <SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" :name="form.jsr2Mc" @change="userSelectJsr2"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id')+$t('form.password')" prop="jsr2mm">
+            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id') + $t('form.password')">
               <el-input type="password" v-model="form.jsr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -181,7 +145,7 @@ G<template>
         </el-row>
 
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-input type="text" :value="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -198,12 +162,12 @@ G<template>
 </template>
 
 <script>
-import { gh, info } from "@/api/business/mjy/mjy"
+import { gh, info } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
-  name: "Gh",
+  name: "GspGh",
   components: { SelectDeptUser },
   data() {
     return {
@@ -213,32 +177,12 @@ export default {
       open: false,
       form: {},
       rules: {
-        rkwz: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        rktj: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         ghzytj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        rkmz: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jsl: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        syl: [{
+        rkl: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -253,16 +197,6 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        ghr2Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ghr2mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         jsr1Id: [{
           required: true,
           message: ' ',
@@ -273,16 +207,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        jsr2Id: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jsr2mm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
+
       }
     }
   },
@@ -294,10 +219,26 @@ export default {
   created() {
   },
   methods: {
+    userSelectGhr1(val) {
+      this.form.ghr1Id = val.id;
+      this.form.ghr1Mc = val.name;
+    },
+    userSelectGhr2(val) {
+      this.form.ghr2Id = val.id;
+      this.form.ghr2Mc = val.name;
+    },
+    userSelectJsr1(val) {
+      this.form.jsr1Id = val.id
+      this.form.jsr1Mc = val.name
+    },
+    userSelectJsr2(val) {
+      this.form.jsr2Id = val.id
+      this.form.jsr2Mc = val.name
+    },
     rklChange() {
       if (!isNaN(this.form.rkmz)) {
         this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz))
-      }else{
+      } else {
         this.form.jsl = ''
       }
     },
@@ -306,45 +247,41 @@ export default {
     },
     reset() {
       this.form = {
-        id:null,
-        rkwz:null,
-        rktj:null,
+        id: null,
+        rkwz: null,
+        rktj: null,
         ghzytj: null,
         rkmz: null,
-        jsl:null,
-        syl:null,
+        jsl: null,
+        syl: null,
         ghr1Id: null,
         ghr1mm: null,
-        ghr2Id:null,
+        ghr2Id: null,
         ghr2mm: null,
-        jsr1Id:null,
+        jsr1Id: null,
         jsr1mm: null,
-        jsr2Id:null,
-        jsr2mm:null,
-        qmyy:'归还',
+        jsr2Id: null,
+        jsr2mm: null,
+        qmyy: '归还',
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      let that=this
-      info({ id: row.id }).then(response => {
-        that.form.id = response.data.id
-        that.form.mc = response.data.mc
-        that.form.bh = response.data.bh
-        that.form.sxrq = response.data.sxrq
-        that.form.nd = response.data.nd
-        that.form.nddw = response.data.nddw
-        that.form.cctj = response.data.cctj
-        that.form.ccwz = response.data.ccwz
-        that.form.ckl = response.data.ckl
-        that.form.ckldw = response.data.ckldw
-        that.form.ffrq = response.data.ffrq
-        that.form.ckmz = response.data.ckmz
-        that.form.ckmzdw = response.data.ckmzdw
-        that.form.mdIds = response.data.mdIds
-        that.open = true
-      })
+      this.form.id = row.id
+      this.form.mc = row.mc
+      this.form.bh = row.bh
+      this.form.ph = row.ph
+      this.form.gg = row.gg
+      this.form.ggdw = row.ggdw
+      this.form.yxq = row.yxq
+      this.form.jsrq = row.jsrq
+      this.form.ffrq = row.ffrq
+      this.form.cctj = row.cctj
+      this.form.kc = row.kc
+      this.form.kcdw = row.kcdw
+      this.form.zysx = row.zysx
+      this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
diff --git a/src/views/business/resource/gsp/comps/mjy/Jd.vue b/src/views/business/resource/gsp/comps/gsp/Jd.vue
similarity index 100%
rename from src/views/business/resource/gsp/comps/mjy/Jd.vue
rename to src/views/business/resource/gsp/comps/gsp/Jd.vue
diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue
new file mode 100644
index 0000000..d96ebf5
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/Js.vue
@@ -0,0 +1,125 @@
+G<template>
+  <div>
+    <!-- 解锁弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gsp.unlock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <!-- <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.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.gsp.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> -->
+        <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="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" 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 { js } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Js",
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        ids: null,
+        mc: null,
+        bh: null,
+        qmyy: '解锁供试品',
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      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) {
+          js(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue
similarity index 91%
rename from src/views/business/resource/gsp/comps/mjy/Jy.vue
rename to src/views/business/resource/gsp/comps/gsp/Jy.vue
index b2aea9b..b425e8b 100644
--- a/src/views/business/resource/gsp/comps/mjy/Jy.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Jy.vue
@@ -4,7 +4,7 @@ G<template>
     <el-dialog :title="$t('page.business.resource.mjy.jieyue')" :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 :style="isBatch ? 'display:block' : 'display:none'">
+        <!-- <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-alert :title="$t('page.business.resource.mjy.jdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
@@ -30,7 +30,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </div>
+        </div> -->
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.resource.mjy.jysj') + '：'" prop="startDate">
@@ -83,7 +83,7 @@ G<template>
 </template>
 
 <script>
-import { jd, jdBatch } from "@/api/business/mjy/mjy"
+import { jy } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -171,17 +171,10 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
-            jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
+          jy(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
 
         }
       })
diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue
new file mode 100644
index 0000000..2a17cd5
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/Sd.vue
@@ -0,0 +1,131 @@
+G<template>
+  <div>
+    <!-- 锁定弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gsp.lock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <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="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" 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 { sd, plsd } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Sd",
+  components: { SelectList },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  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: '锁定供试品',
+        qmrmm: 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) {
+            plsd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          } else {
+            sd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/SelectList.vue b/src/views/business/resource/gsp/comps/gsp/SelectList.vue
similarity index 100%
rename from src/views/business/resource/gsp/comps/mjy/SelectList.vue
rename to src/views/business/resource/gsp/comps/gsp/SelectList.vue
diff --git a/src/views/business/resource/gsp/comps/mjy/Shbj.vue b/src/views/business/resource/gsp/comps/gsp/Shbj.vue
similarity index 67%
rename from src/views/business/resource/gsp/comps/mjy/Shbj.vue
rename to src/views/business/resource/gsp/comps/gsp/Shbj.vue
index 22d004f..ae1d477 100644
--- a/src/views/business/resource/gsp/comps/mjy/Shbj.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Shbj.vue
@@ -1,54 +1,50 @@
 G<template>
   <div>
     <!-- 审核编辑弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.shbj')" :visible.sync="open" width="800px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gsp.shbj')" :visible.sync="open" width="800px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
               <el-input type="text" v-model="form.mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
+            <el-form-item :label="$t('page.business.resource.gsp.bh')" prop="glyj">
               <el-input type="text" v-model="form.bh" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.nd')" prop="nd">
-              <el-input type="text" v-model="form.nd" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="nd">
+              <el-input type="text" v-model="form.ph" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.nddw')" prop="nddw">
-              <el-input type="text" v-model="form.nddw" maxlength="50" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.sxrq')" prop="sxrq">
-              <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="nddw">
+              <el-input type="text" v-model="form.gg" maxlength="50" disabled >
+                <template slot="append">{{ form.ggdw }}</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
-              <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
+            <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="sxrq">
+              <el-input type="text" v-model="form.yxq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
-              <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
+           <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="cctj">
+              <el-input type="text" v-model="form.jsrq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.xgr')">
               <el-input type="text" v-model="form.bjrMc" disabled />
             </el-form-item>
@@ -101,13 +97,11 @@ G<template>
 </template>
 
 <script>
-import { shbj, info } from "@/api/business/mjy/mjy"
+import { shbj, info } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
 
 export default {
   name: "Shbj",
-  components: { SelectList },
   data() {
     return {
       open: false,
@@ -118,41 +112,6 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        mc: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        bh: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        nd: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        nddw: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        sxrq: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        cctj: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ccwz: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
         qmrmm: [{
           required: true,
           message: ' ',
@@ -197,11 +156,11 @@ export default {
         this.form.id = response.data.id
         this.form.mc = response.data.mcbj
         this.form.bh = response.data.bh
-        this.form.nd = response.data.ndbj
-        this.form.nddw = response.data.nddwbj
-        this.form.sxrq = response.data.sxrqbj
-        this.form.cctj = response.data.cctjbj
-        this.form.ccwz = response.data.ccwzbj
+        this.form.ph = response.data.phbj
+        this.form.gg = response.data.ggbj
+        this.form.ggdw = response.data.ggdwbj
+        this.form.yxq = response.data.yxqbj
+        this.form.jsrq = response.data.jsrqbj
         this.form.bjbz = response.data.bjbz
         this.form.bjrMc = response.data.bjrMc
         this.open = true
diff --git a/src/views/business/resource/gsp/comps/mjy/Shxgkc.vue b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue
similarity index 79%
rename from src/views/business/resource/gsp/comps/mjy/Shxgkc.vue
rename to src/views/business/resource/gsp/comps/gsp/Shxgkc.vue
index 3a692a8..ec3b74f 100644
--- a/src/views/business/resource/gsp/comps/mjy/Shxgkc.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue
@@ -1,40 +1,46 @@
 G<template>
   <div>
     <!-- 审核修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.shxgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gsp.shxgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mcbj">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mcbj">
               <el-input type="text" v-model="form.mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
+            <el-form-item :label="$t('page.business.resource.gsp.bh')" prop="glyj">
               <el-input type="text" v-model="form.bh" maxlength="50" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.kc')" prop="kcbj">
-              <el-input type="number" v-model="form.kcbj" maxlength="50" disabled />
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.xgqkc')" prop="kcbj">
+              <el-input type="number" v-model="form.kc" maxlength="50" disabled >
+                <template slot="append">{{ form.kcdw }}</template>
+              </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.kcdw')" prop="kcdwbj">
-              <el-input type="text" v-model="form.kcdwbj" maxlength="50" disabled />
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.xghkc')" prop="kcdwbj">
+              <el-input type="text" v-model="form.kcbj" maxlength="50" disabled >
+                <template slot="append">{{ form.kcdwbj }}</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
          <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.resource.mjy.xgr')">
+            <el-form-item :label="$t('page.business.resource.gsp.xgr')">
               <el-input type="text" v-model="form.kcbjrMc" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.resource.mjy.xgbz')" prop="kcbjbz">
+            <el-form-item :label="$t('page.business.resource.gsp.xgbz')" prop="kcbjbz">
               <el-input type="text" v-model="form.kcbjbz" disabled />
             </el-form-item>
           </el-col>
@@ -81,7 +87,7 @@ G<template>
 </template>
 
 <script>
-import { shxgkc, info } from "@/api/business/mjy/mjy"
+import { shxgkc, info } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -149,6 +155,8 @@ export default {
         this.form.id = response.data.id
         this.form.mc = response.data.mc
         this.form.bh = response.data.bh
+        this.form.kc = response.data.kc
+        this.form.kcdw = response.data.kcdw
         this.form.kcbj = response.data.kcbj
         this.form.kcdwbj = response.data.kcdwbj
         this.form.kcbjbz = response.data.kcbjbz
diff --git a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue
new file mode 100644
index 0000000..a7ce89e
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue
@@ -0,0 +1,140 @@
+G<template>
+  <div>
+    <!-- 修改库存弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gsp.xgkc')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="18">
+            <el-form-item :label="$t('page.business.resource.gsp.kcl')" prop="kc">
+              <el-input type="number" v-model="form.kc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <BusinessSelectVue dictType="system_business_nddw,system_business_zldw,system_business_tjdw" v-model="form.kcdw" />
+          </el-col>
+        </el-row>
+        <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.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-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-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 { xgkc } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+import BusinessSelectVue from '@/views/business/comps/select/BusinessSelect';
+export default {
+  name: "GspXgkc",
+  components: { SelectList, BusinessSelectVue },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        sdrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  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,
+        kc: '',
+        kcdw: '',
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.isBatch = false
+      this.form.ids = []
+      this.selectList = []
+      this.form.id = row.id
+      this.form.kcdw = row.kcdw
+      this.form.kc = row.kc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          xgkc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue
similarity index 76%
rename from src/views/business/resource/gsp/comps/mjy/Xq.vue
rename to src/views/business/resource/gsp/comps/gsp/Xq.vue
index 9fbb85d..d09f324 100644
--- a/src/views/business/resource/gsp/comps/mjy/Xq.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue
@@ -8,11 +8,12 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
+          <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.gsp.gspxq')
+        }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
@@ -21,77 +22,57 @@ G<template>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.mc') }}</div>
+              <div class="left-title">{{ $t('page.business.resource.gsp.mc') }}</div>
               <el-input type="text" :value="form.mc" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.resource.mjy.bh') }}</div>
+              <div class="right-title">{{ $t('page.business.resource.gsp.bh') }}</div>
               <el-input type="text" :value="form.bh" maxlength="50" disabled />
             </div>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.nd') }}</div>
-              <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{
-                form.nddw }}</template>
-              </el-input>
+              <div class="left-title">{{ $t('page.business.resource.gsp.ph') }}</div>
+              <el-input type="text" :value="form.ph" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.resource.mjy.kcl') }}</div>
-              <el-input type="text" :value="form.kc" maxlength="50" disabled> <template slot="append">{{
-                form.kcdw }}</template> </el-input>
+              <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
+              <el-input type="text" :value="form.gg" maxlength="50" disabled> <template slot="append">{{
+                form.ggdw }}</template> </el-input>
             </div>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.sxrq') }}</div>
-              <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
+              <div class="left-title">{{ $t('page.business.resource.gsp.jsrq') }}</div>
+              <el-input type="text" :value="form.jsrq" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.resource.mjy.cctj') }}</div>
-              <el-input type="text" :value="form.cctj" maxlength="50" disabled />
+              <div class="right-title">{{ $t('page.business.resource.gsp.kcl') }}</div>
+              <el-input type="text" :value="form.kc" maxlength="50" disabled > <template slot="append">{{
+                form.kcdw }}</template> </el-input>
             </div>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.ccwz') }}</div>
-              <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
+              <div class="left-title">{{ $t('page.business.resource.gsp.yxq') }}</div>
+              <el-input type="text" :value="form.yxq" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.resource.mjy.zjzt') }}</div>
+              <div class="right-title">{{ $t('page.business.resource.gsp.zjzt') }}</div>
               <el-select v-model="form.zjzt" disabled style="width: 100%;">
-                <el-option key="1" :label="$t('page.business.resource.zjzt.rk')" :value="1" />
-                <el-option key="3" :label="$t('page.business.resource.zjzt.yff')" :value="3" />
-                <el-option key="5" :label="$t('page.business.resource.zjzt.ysd')" :value="5" />
-                <el-option key="7" :label="$t('page.business.resource.zjzt.dgd')" :value="7" />
-                <el-option key="9" :label="$t('page.business.resource.zjzt.gd')" :value="9" />
-                <el-option key="11" :label="$t('page.business.resource.zjzt.djd')" :value="11" />
+                <el-option key="1" :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+                <el-option key="3" :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+                <el-option key="5" :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+                <el-option key="7" :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+                <el-option key="9" :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+                <el-option key="11" :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
               </el-select>
             </div>
           </div>
+
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 表单信息</div>
-          </div>
-          <div class="pal">
-            <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.md') }}</div>
-              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.resource.mjy.ssbd') }}</div>
-              <el-input type="text" :value="form.bdMc" maxlength="50" disabled />
-            </div>
-          </div>
-          <div class="pal">
-            <div class="left">
-              <div class="left-title">{{ $t('page.business.resource.mjy.bdssr') }}</div>
-              <el-input type="text" :value="form.bdssrMc" maxlength="50" disabled />
-            </div>
-          </div>
-          <div class="content-title">
-            <div class="line"></div>
-            <div class="subtitle"> {{ $t('page.business.resource.mjy.tz') }}</div>
+            <div class="subtitle"> {{ $t('page.business.resource.gsp.tz') }}</div>
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
@@ -144,7 +125,7 @@ G<template>
 </template>
 
 <script>
-import { info, tzList, jcgjList } from "@/api/business/mjy/mjy"
+import { info, tzList, jcgjList } from "@/api/business/gsp/gsp"
 import JcgjList from "@/views/business/comps/common/JcgjList";
 
 export default {
@@ -174,7 +155,7 @@ export default {
   created() {
   },
   methods: {
-    exportExcel(){
+    exportExcel() {
       alert('todo')
     },
     jcgjListHandleQuery(val) {
@@ -209,8 +190,8 @@ export default {
     },
     show(row) {
       this.$modal.loading()
-      this.queryParamstZ.mjyId = row.id
-      this.queryJcgjParams.mjyId = row.id
+      this.queryParamstZ.gspId = row.id
+      this.queryJcgjParams.gspId = row.id
       info({ id: row.id }).then(response => {
         this.form = response.data
         this.getTzList()
diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue
new file mode 100644
index 0000000..f402bf5
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue
@@ -0,0 +1,234 @@
+G<template>
+  <div>
+    <!-- 新增弹窗 -->
+    <el-dialog :title="$t('form.add')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <!-- 名称 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 编号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.bh')" prop="bh">
+              <el-input type="text" v-model="form.bh" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 批号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="ph">
+              <el-input type="text" v-model="form.ph" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 规格 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
+              <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 规格单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.ggdw"
+              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 库存量 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.kcl')" prop="kc">
+              <el-input type="number" v-model="form.kc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 库存量单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.kcdw"
+              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 存储条件 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="system_business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+          <!-- 接收日期 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="jsrq">
+              <el-date-picker v-model="form.jsrq" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 注意事项 -->
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.zysx')" prop="zysx">
+              <el-input type="textarea" :rows="2" v-model="form.zysx" maxlength="500"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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.signerPsw')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmbz')" prop="qmbz">
+              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </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 { save } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Xz",
+  components: { BusinessSelect },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        mc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        bh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ph: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        gg: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        yxq: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsrq: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zysx: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        mc: null,
+        bh: null,
+        nd: null,
+        nddw: null,
+        sxrq: null,
+        cctj: null,
+        ccwz: null,
+        qmrmm: null,
+        qmyy: '新增供试品',
+        bjbz: ''
+      }
+      this.resetForm("form")
+    },
+    show() {
+      this.reset()
+
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          save(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
similarity index 100%
rename from src/views/business/resource/gsp/comps/mjy/Ysff.vue
rename to src/views/business/resource/gsp/comps/gsp/Ysff.vue
diff --git a/src/views/business/resource/gsp/comps/mjyList.vue b/src/views/business/resource/gsp/comps/gspList.vue
similarity index 62%
rename from src/views/business/resource/gsp/comps/mjyList.vue
rename to src/views/business/resource/gsp/comps/gspList.vue
index 5b2b682..284d96a 100644
--- a/src/views/business/resource/gsp/comps/mjyList.vue
+++ b/src/views/business/resource/gsp/comps/gspList.vue
@@ -4,18 +4,23 @@
     <div>
       <div class="mjy" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
-          <!-- 名称 -->
-          <el-form-item :label="$t('page.business.resource.mjy.mc') + '：'">
+          <!-- 名称/代码 -->
+          <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'" prop="mc">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.resource.mjy.bh') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'" prop="bh">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
+          <!-- 批号 -->
+          <el-form-item :label="$t('page.business.resource.gsp.ph') + '：'" prop="ph">
+            <el-input v-model="queryParams.ph" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
           <!-- 借阅状态 -->
-          <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'" prop="jyzt">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
@@ -24,7 +29,7 @@
             </el-select>
           </el-form-item>
           <!-- 制剂状态 -->
-          <el-form-item :label="$t('page.business.resource.mjy.zjzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.zjzt') + '：'" prop="zjzt">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option :label="$t('page.business.resource.zjzt.rk')" :value="1" />
@@ -36,7 +41,7 @@
             </el-select>
           </el-form-item>
           <!-- 失效日期 -->
-          <el-form-item :label="$t('page.business.resource.mjy.sxrq') + '：'">
+          <el-form-item :label="$t('page.business.resource.gsp.yxq') + '：'">
             <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
               :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" value-format="yyyy-MM-dd"
               @change="handleQuery" style="width: 250px;" />
@@ -49,148 +54,140 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <!-- 批量发放 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlff"
-              v-hasPermi="['business:resource:mjy:ff']">{{
-                $t('page.business.resource.mjy.plff') }}</el-button>
+            <!-- 更新物资库 -->
+            <el-button type="primary" @click="handlePlff">{{
+              $t('page.business.resource.gsp.gxwzk') }}</el-button>
           </el-col>
           <el-col :span="1.5">
-            <!-- 批量处置药剂 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlczyj"
-              v-hasPermi="['business:resource:mjy:czyj']">{{
-                $t('page.business.resource.mjy.plczyj') }}</el-button>
+            <!-- 新增 -->
+            <el-button type="primary" @click="handleXz">{{
+              $t('form.add') }}</el-button>
           </el-col>
           <el-col :span="1.5">
-            <!-- 批量处置容器 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlczrq"
-              v-hasPermi="['business:resource:mjy:czrq']">{{
-                $t('page.business.resource.mjy.plczrq') }}</el-button>
+            <!-- 批量发放 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlff">{{
+              $t('page.business.resource.gsp.plff') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量处置 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlcz">{{
+              $t('page.business.resource.gsp.plcz') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 钥匙发放 -->
-            <el-button type="primary" :disabled="multiple" @click="handleYsff"
-              v-hasPermi="['business:resource:mjy:ysff']">{{
-                $t('page.business.resource.mjy.ysff') }}</el-button>
+            <el-button type="primary" :disabled="multiple" @click="handleYsff">{{
+              $t('page.business.resource.gsp.ysff') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlsd"
-              v-hasPermi="['business:resource:mjy:sd']">{{
-                $t('page.business.resource.mjy.plsd') }}</el-button>
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd">{{
+              $t('page.business.resource.gsp.plsd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量归档 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlgd"
-              v-hasPermi="['business:resource:mjy:gd']">{{
-                $t('page.business.resource.mjy.plgd') }}</el-button>
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd">{{
+              $t('page.business.resource.gsp.plgd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
-            <el-button type="primary" :disabled="multiple" @click="handleDc"
-              v-hasPermi="['business:resource:mjy:dc']">{{
-                $t('form.export') }}</el-button>
+            <el-button type="primary" @click="handleDc">{{
+              $t('form.export') }}</el-button>
           </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
           <el-table-column type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" />
-          <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+          <el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
+          <el-table-column :label="$t('page.business.resource.gsp.bh')" align="center" prop="bh"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.nd')" align="center">
+          <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
             <template slot-scope="scope">
-              {{ scope.row.nd }}{{ scope.row.nddw }}
+              {{ scope.row.gg }}{{ scope.row.ggdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.kcl')" align="center">
+          <el-table-column :label="$t('page.business.resource.gsp.kcl')" align="center">
             <template slot-scope="scope">
               {{ scope.row.kc }}{{ scope.row.kcdw }}
             </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.zcg')" align="center" prop="zcgMc" width="130px" />
-          <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" />
+          <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.jsrq')" align="center" prop="jsrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.cctj')" align="center" prop="cctj" width="130px" />
 
           <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
-              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.zjzt.rk') }}</span>
-              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.zjzt.yff') }}</span>
-              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.zjzt.ysd') }}</span>
-              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.zjzt.dgd') }}</span>
-              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.resource.zjzt.gd') }}</span>
-              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.zjzt.djd') }}</span>
+              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</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>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.resource.resource.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
-              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.resource.jyzt.jyz') }}</span>
+              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.resource.resource.jyzt.jyz') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
-              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
+              <template
+                v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || (scope.row.zjzt == 9 && scope.row.jyzt == 5)">
                 <!-- 详情 -->
-                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:xq']">{{
-                  $t('page.business.resource.mjy.detail') }}</el-button>
+                <el-button type="text" @click="handleXq(scope.row)">{{
+                  $t('page.business.resource.gsp.detail') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 1">
                 <!-- 发放 -->
-                <el-button type="text" @click="handleFf(scope.row)" v-hasPermi="['business:resource:mjy:ff']">{{
-                  $t('page.business.resource.mjy.fafang') }}</el-button>
-                <!-- 处置药剂 -->
-                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:mjy:czyj']">{{
-                  $t('page.business.resource.mjy.czyj') }}</el-button>
-                <!-- 处置容器 -->
-                <el-button v-if="scope.row.rqzt == 1" type="text" @click="handleCzrq(scope.row)"
-                  v-hasPermi="['business:resource:mjy:czrq']">{{
-                    $t('page.business.resource.mjy.czrq') }}</el-button>
+                <el-button type="text" @click="handleFf(scope.row)">{{
+                  $t('page.business.resource.gsp.fafang') }}</el-button>
+                <!-- 处置 -->
+                <el-button type="text" @click="handleCz(scope.row)">{{
+                  $t('page.business.resource.gsp.cz') }}</el-button>
                 <!-- 编辑 -->
-                <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
-                  v-hasPermi="['business:resource:mjy:bj']">{{
-                    $t('form.edit') }}</el-button>
+                <el-button v-if="scope.row.bjzt == 1 && scope.row.zjzt == 1" type="text" @click="handleBj(scope.row)">{{
+                  $t('form.edit') }}</el-button>
                 <!-- 修改库存 -->
-                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
-                  v-hasPermi="['business:resource:mjy:xgkc']">{{
-                    $t('page.business.resource.mjy.xgkc') }}</el-button>
+                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)" >{{
+                    $t('page.business.resource.gsp.xgkc') }}</el-button>
                 <!-- 锁定 -->
-                <el-button type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:mjy:sd']">{{
-                  $t('page.business.resource.mjy.lock') }}</el-button>
+                <el-button type="text" @click="handleSd(scope.row)">{{
+                  $t('page.business.resource.gsp.lock') }}</el-button>
               </template>
               <template v-if="scope.row.bjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核编辑 -->
-                <el-button type="text" @click="handleShbj(scope.row)" v-hasPermi="['business:resource:mjy:shbj']">{{
-                  $t('page.business.resource.mjy.shbj') }}</el-button>
+                <el-button type="text" @click="handleShbj(scope.row)" >{{
+                  $t('page.business.resource.gsp.shbj') }}</el-button>
               </template>
               <template v-if="scope.row.kcbjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核修改库存 -->
-                <el-button type="text" @click="handleShxgkc(scope.row)" v-hasPermi="['business:resource:mjy:shxgkc']">{{
-                  $t('page.business.resource.mjy.shxgkc') }}</el-button>
+                <el-button type="text" @click="handleShxgkc(scope.row)">{{
+                  $t('page.business.resource.gsp.shxgkc') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 5">
                 <!-- 解锁 -->
-                <el-button type="text" @click="handleJs(scope.row)" v-hasPermi="['business:resource:mjy:js']">{{
-                  $t('page.business.resource.mjy.unlock') }}</el-button>
+                <el-button type="text" @click="handleJs(scope.row)">{{
+                  $t('page.business.resource.gsp.unlock') }}</el-button>
                 <!-- 归档 -->
-                <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:mjy:gd']">{{
-                  $t('page.business.resource.mjy.guidang') }}</el-button>
+                <el-button type="text" @click="handleGd(scope.row)">{{
+                  $t('page.business.resource.gsp.guidang') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 3">
                 <!-- 归还 -->
-                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
-                  $t('page.business.resource.mjy.guihuan') }}</el-button>
+                <el-button type="text" @click="handleGh(scope.row)" >{{
+                  $t('page.business.resource.gsp.guihuan') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 9">
+              <template v-if="scope.row.zjzt == 9 && scope.row.jyzt == 1">
                 <!-- 解档 -->
-                <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
-                  $t('page.business.resource.mjy.jiedang') }}</el-button>
-                <!-- 借阅 -->
-                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:mjy:jy']">{{
-                  $t('page.business.resource.mjy.jieyue') }}</el-button>
+                <el-button type="text" @click="handleJd(scope.row)" >{{
+                  $t('page.business.resource.gsp.jiedang') }}</el-button>
+                  <!-- 借阅 -->
+                <el-button type="text" @click="handleJy(scope.row)" >{{
+                  $t('page.business.resource.gsp.jieyue') }}</el-button>
               </template>
             </template>
           </el-table-column>
@@ -199,6 +196,8 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </div>
+      <!-- 新增 -->
+      <Xz key="Xz" ref="Xz" @callback="handleQuery" />
       <!-- 锁定 -->
       <Sd key="Sd" ref="Sd" @callback="handleQuery" />
       <!-- 解锁 -->
@@ -221,10 +220,10 @@
       <Gh key="Gh" ref="Gh" @callback="handleQuery" />
       <!-- 发放 -->
       <Ff key="Ff" ref="Ff" @callback="handleQuery" />
-      <!-- 处置药剂 -->
-      <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
-      <!-- 处置容器 -->
-      <Czrq key="Czrq" ref="Czrq" @callback="handleQuery" />
+      <!-- 处置 -->
+      <Cz key="Cz" ref="Cz" @callback="handleQuery" />
+      <!-- 批量处置 -->
+      <CzBatch key="CzBatch" ref="CzBatch" @callback="handleQuery" />
       <!-- 钥匙发放 -->
       <Ysff key="Ysff" ref="Ysff" @callback="handleQuery" />
       <!-- 详情 -->
@@ -234,33 +233,34 @@
 </template>
 
 <script>
-import { list } from "@/api/business/mjy/mjy"
-import Sd from "./mjy/Sd";
-import Js from "./mjy/Js";
-import Gd from "./mjy/Gd";
-import Jd from "./mjy/Jd";
-import Xq from "./mjy/Xq";
-import Bj from "./mjy/Bj";
-import Shbj from "./mjy/Shbj";
-import Xgkc from "./mjy/Xgkc";
-import Shxgkc from "./mjy/Shxgkc";
-import Jy from "./mjy/Jy";
-import Gh from "./mjy/Gh";
-import Ff from "./mjy/Ff";
-import Czrq from "./mjy/Czrq";
-import Czyj from "./mjy/Czyj";
-import Ysff from "./mjy/Ysff";
+import { list } from "@/api/business/gsp/gsp"
+import Sd from "./gsp/Sd";
+import Js from "./gsp/Js";
+import Gd from "./gsp/Gd";
+import Jd from "./gsp/Jd";
+import Xq from "./gsp/Xq";
+import Bj from "./gsp/Bj";
+import Xz from "./gsp/Xz";
+import Shbj from "./gsp/Shbj";
+import Xgkc from "./gsp/Xgkc";
+import Shxgkc from "./gsp/Shxgkc";
+import Jy from "./gsp/Jy";
+import Gh from "./gsp/Gh";
+import Ff from "./gsp/Ff";
+import Cz from "./gsp/Cz";
+import CzBatch from "./gsp/CzBatch";
+import Ysff from "./gsp/Ysff";
 
 export default {
-  name: "MjyList",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
+  name: "GspList",
+  components: { Xz, Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Cz, CzBatch, Ff, Ysff },
   data() {
     return {
       daterange: [],
       loading: true,
       single: true,
       multiple: true,
-      showDetail:false,
+      showDetail: false,
       total: 0,
       list: [],
       //勾选列表
@@ -286,6 +286,10 @@ export default {
     handleDc() {
 
     },
+    // 新增
+    handleXz() {
+      this.$refs.Xz.show()
+    },
     //钥匙发放
     handleYsff() {
       this.$refs.Ysff.showBatch(this.selectList)
@@ -298,21 +302,13 @@ export default {
     handleFf(row) {
       this.$refs.Ff.show(row)
     },
-    //处置容器
-    handleCzrq(row) {
-      this.$refs.Czrq.show(row)
-    },
-    //批量处置容器
-    handlePlczrq() {
-      this.$refs.Czrq.showBatch(this.selectList)
-    },
-    //处置药剂
-    handleCzyj(row) {
-      this.$refs.Czyj.show(row)
+    //处置
+    handleCz(row) {
+      this.$refs.Cz.show(row)
     },
-    //批量处置药剂
-    handlePlczyj() {
-      this.$refs.Czyj.showBatch(this.selectList)
+    //批量处置
+    handlePlcz() {
+      this.$refs.CzBatch.showBatch(this.selectList)
     },
     //编辑
     handleBj(row) {
@@ -342,15 +338,15 @@ export default {
     checkSelectable(row) {
       return true;
     },
-    closeXq(){
-      this.showDetail=false
-      this.$emit('showDetail',this.showDetail)
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
       this.handleQuery()
     },
     //详情
     handleXq(row) {
-      this.showDetail=true
-      this.$emit('showDetail',this.showDetail)
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
     //批量解锁
@@ -384,8 +380,8 @@ export default {
     //获取列表
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
-        this.queryParams.startDate = this.daterange[0]
-        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.startDate = this.daterange[0] + ' 00:00:00'
+        this.queryParams.endDate = this.daterange[1] + ' 23:59:59'
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''
@@ -404,6 +400,7 @@ export default {
     },
     //重置
     resetQuery() {
+      this.dateRange = []
       this.resetForm("queryForm")
       this.handleQuery()
     },
diff --git a/src/views/business/resource/gsp/comps/mjy/Czrq.vue b/src/views/business/resource/gsp/comps/mjy/Czrq.vue
deleted file mode 100644
index fd9fdc1..0000000
--- a/src/views/business/resource/gsp/comps/mjy/Czrq.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-G<template>
-  <div>
-    <!-- 处置容器弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.czrq')" :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 :style="isBatch?'display:block':'display:none'">
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
-                  :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
-                  :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.mjy.czfs')" align="center" width="250px">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.yuanyin')" align="center">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czyy" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('form.operate')" align="center" width="150px">
-                  <template slot-scope="scope">
-                    <el-button type="text" @click="handleSc(scope.row)">{{
-                      $t('form.delete') }}</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-col>
-          </el-row>
-        </div>
-        <div v-if="!isBatch">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.czfs')" prop="czfs">
-                <el-input type="text" v-model="form.czfs" maxlength="50" :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.yuanyin')" prop="czyy">
-                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
-                  :placeholder="$t('form.placeholderInput')">
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-        </div>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.clr')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.clr')+$t('form.password')" prop="clrmm">
-              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.fhr')" prop="fhrId">
-              <SelectDeptUser  v-model="form.fhrId" key="jdrId"/>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.fhr')+$t('form.password')" prop="fhrmm">
-              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jdr')" prop="jdrId">
-              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jdr')+$t('form.password')" prop="jdrmm">
-              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" v-model="form.qmyy" maxlength="20" disabled />
-            </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 { czrq, plczrq } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
-
-export default {
-  name: "Bj",
-  components: { SelectDeptUser },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        czyy: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        czfs: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        clrId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        fhrId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jdrId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        clrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        fhrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    handleSc(row) {
-      const that = this
-      this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
-        return delDept(row.deptId)
-      }).then(() => {
-        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
-        if (_index > -1) {
-          that.selectList.splice(_index, 1)
-          that.form.ids = that.selectList.map(item => item.id)
-        }
-      }).catch(() => { })
-    },
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.selectList = []
-      this.form.ids = val.map(item => item.id)
-      let tmp = []
-      _.forEach(val, function (item) {
-        tmp.push({
-          id: item.id,
-          mc: item.mc,
-          bh: item.bh,
-          czyy: null,
-          czfs: null,
-        })
-      })
-      this.selectList = tmp
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: [],
-        mc: null,
-        bh: null,
-        czyy: null,
-        czfs: null,
-        clrId: null,
-        fhrId: null,
-        jdrId: null,
-        qmyy: '处置容器',
-        qmrmm: 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) {
-          let params = this.form
-          if (this.isBatch) {
-            params.list = this.selectList
-            if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
-            } else {
-              plczrq(params).then(response => {
-                this.open = false
-                this.$emit('callback')
-              })
-            }
-          } else {
-            czrq(params).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Czyj.vue b/src/views/business/resource/gsp/comps/mjy/Czyj.vue
deleted file mode 100644
index 6511670..0000000
--- a/src/views/business/resource/gsp/comps/mjy/Czyj.vue
+++ /dev/null
@@ -1,297 +0,0 @@
-G<template>
-  <div>
-    <!-- 处置药剂弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.czyj')" :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 :style="isBatch?'display:block':'display:none'">
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
-                  :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
-                  :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.mjy.czfs')" align="center" width="250px">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.yuanyin')" align="center">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czyy" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.czl')" align="center">
-                  <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czl" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw }}</template>
-                    </el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('form.operate')" align="center" width="150px">
-                  <template slot-scope="scope">
-                    <el-button type="text" @click="handleSc(scope.row)">{{
-                      $t('form.delete') }}</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-col>
-          </el-row>
-        </div>
-        <div v-if="!isBatch">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.czfs')" prop="czfs">
-                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.mjy.czl')" prop="czl">
-                <el-input-number type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" > <template slot="append">{{ form.kcdw }}</template>
-                  </el-input-number>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.mjy.yuanyin')" prop="czyy">
-                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
-                  :placeholder="$t('form.placeholderInput')">
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-        </div>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.clr')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled />
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.clr')+$t('form.password')" prop="clrmm">
-              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.fhr')" prop="fhrId">
-              <SelectDeptUser  v-model="form.fhrId" key="fhrId"/>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.fhr')+$t('form.password')" prop="fhrmm">
-              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jdr')" prop="jdrId">
-              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jdr')+$t('form.password')" prop="jdrmm">
-              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" v-model="form.qmyy" maxlength="20" disabled />
-            </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 { czyj, plczyj } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
-
-export default {
-  name: "Czyj",
-  components: { SelectDeptUser },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        czyy: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        czfs: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        czl: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        clrId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        fhrId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jdrId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        clrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        fhrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        jdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    handleSc(row) {
-      const that = this
-      this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
-        return delDept(row.deptId)
-      }).then(() => {
-        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
-        if (_index > -1) {
-          that.selectList.splice(_index, 1)
-          that.form.ids = that.selectList.map(item => item.id)
-        }
-      }).catch(() => { })
-    },
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.selectList = []
-      this.form.ids = val.map(item => item.id)
-      let tmp = []
-      _.forEach(val, function (item) {
-        tmp.push({
-          id: item.id,
-          mc: item.mc,
-          bh: item.bh,
-          kcdw: item.kcdw,
-          czyy: null,
-          czl: null,
-          czfs: null,
-        })
-      })
-      this.selectList = tmp
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        czyy: null,
-        kcdw: null,
-        czfs: null,
-        clrId: null,
-        fhrId: null,
-        jdrId: null,
-        czl: null,
-        qmyy: '处置药剂',
-        qmrmm: 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.form.kcdw = row.kcdw
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          let params = this.form
-          if (this.isBatch) {
-            params.list = this.selectList
-            if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
-            } else {
-              plczyj(params).then(response => {
-                this.open = false
-                this.$emit('callback')
-              })
-            }
-          } else {
-            czyj(params).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
new file mode 100644
index 0000000..00d2b46
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -0,0 +1,218 @@
+G<template>
+  <div>
+    <!-- 编辑弹窗 -->
+    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <!-- 名称 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 编号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="ph">
+              <el-input type="text" v-model="form.ph" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 规格 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
+              <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 规格单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.ggdw"
+              dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
+          </el-col>
+          <!-- 入库时间 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
+              <el-date-picker v-model="form.rksj" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 库存量 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.rkl')" prop="rkl">
+              <el-input type="number" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 库存量单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.rkdw"
+              dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
+          </el-col>
+          <!-- 存储条件 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 注意事项 -->
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.zysx')" prop="zysx">
+              <el-input type="textarea" :rows="2" v-model="form.zysx" maxlength="500"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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.signerPsw')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :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="qmbz">
+              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </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 { bj, info } from "@/api/business/gsp/gspRkjl"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Bj",
+  components: { BusinessSelect },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        mc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        bh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ph: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        gg: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rksj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zysx: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        qmyy: '编辑供试品入库记录',
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      info({id: row.id}).then(response => {
+        this.form.id = response.data.id
+        this.form.mc = response.data.mc
+        this.form.ph = response.data.ph
+        this.form.gg = response.data.gg
+        this.form.ggdw = response.data.ggdw
+        this.form.rkl = response.data.rkl
+        this.form.rkdw = response.data.rkdw
+        this.form.rksj = response.data.rksj
+        this.form.cctj = response.data.cctj
+        this.form.zysx = response.data.zysx
+        this.form.qmyy = '编辑供试品入库记录'
+        console.log(this.form)
+        this.open = true
+
+      })
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          bj(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Gd.vue b/src/views/business/resource/gsp/comps/rkjl/Gd.vue
similarity index 93%
rename from src/views/business/resource/gsp/comps/mjy/Gd.vue
rename to src/views/business/resource/gsp/comps/rkjl/Gd.vue
index 6b568f8..52f5aaf 100644
--- a/src/views/business/resource/gsp/comps/mjy/Gd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Gd.vue
@@ -1,18 +1,18 @@
 G<template>
   <div>
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gsp.gd')" :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 :style="isBatch ? 'display:block' : 'display:none'">
-          <el-row style="margin:10px 0px;">
+          <!-- <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
          <div v-if="!isBatch">
-          <el-row>
+          <!-- <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
@@ -27,7 +27,7 @@ G<template>
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
         <el-row>
           <el-col :span="24">
@@ -71,7 +71,7 @@ G<template>
 </template>
 
 <script>
-import { gd, plgd } from "@/api/business/mjy/mjy"
+import { gd, plgd } from "@/api/business/gsp/gspRkjl"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
diff --git a/src/views/business/resource/gsp/comps/rkjl/Jd.vue b/src/views/business/resource/gsp/comps/rkjl/Jd.vue
new file mode 100644
index 0000000..61e90ee
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/rkjl/Jd.vue
@@ -0,0 +1,144 @@
+G<template>
+  <div >
+    <!-- 解档弹窗 -->
+    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <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>
+        <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="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" 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 { jd, jdBatch } from "@/api/business/gsp/gspRkjl"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Jd",
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  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: '申请解档',
+        qmrmm: 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) {
+            jdBatch(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          } else {
+            jd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/mjy/Js.vue b/src/views/business/resource/gsp/comps/rkjl/Js.vue
similarity index 97%
rename from src/views/business/resource/gsp/comps/mjy/Js.vue
rename to src/views/business/resource/gsp/comps/rkjl/Js.vue
index 1d6e4f5..7b32165 100644
--- a/src/views/business/resource/gsp/comps/mjy/Js.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Js.vue
@@ -61,7 +61,7 @@ G<template>
 </template>
 
 <script>
-import { js } from "@/api/business/mjy/mjy"
+import { js } from "@/api/business/gsp/gspRkjl"
 import { mapGetters } from 'vuex'
 
 export default {
@@ -96,7 +96,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁麻精药',
+        qmyy: '解锁发放记录',
         qmrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gsp/comps/mjy/Xgkc.vue b/src/views/business/resource/gsp/comps/rkjl/Jy.vue
similarity index 63%
rename from src/views/business/resource/gsp/comps/mjy/Xgkc.vue
rename to src/views/business/resource/gsp/comps/rkjl/Jy.vue
index e466414..1639899 100644
--- a/src/views/business/resource/gsp/comps/mjy/Xgkc.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Jy.vue
@@ -1,59 +1,64 @@
 G<template>
   <div>
-    <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.xgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <!-- 借阅弹窗 -->
+    <el-dialog :title="$t('page.business.resource.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mcbj">
-              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+          <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-col :span="12">
+        </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 />
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.kc')" prop="kcbj">
-              <el-input type="number" v-model="form.kc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.kcdw')" prop="kcdwbj">
-              <el-input type="text" v-model="form.kcdw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.mjy.jysj') + '：'" prop="startDate">
+              <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+                :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                value-format="yyyy-MM-dd" @change="daterangeChange" style="width: 250px;" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <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-col :span="12">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
+        </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.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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.remark')" >
-              <el-input type="textarea" v-model="form.kcbjbz" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -67,33 +72,32 @@ G<template>
 </template>
 
 <script>
-import { xgkc } from "@/api/business/mjy/mjy"
+import { jy } from "@/api/business/gsp/gspRkjl"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
 
 export default {
-  name: "Xgkc",
-  components: { SelectList },
+  name: "Jy",
   data() {
     return {
       open: false,
       form: {},
+      daterange: [],
       rules: {
-        kc: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        kcdw: [{
+        endDate: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        qmrmm: [{
+        startDate: [{
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
       }
     }
   },
@@ -108,16 +112,25 @@ export default {
     cancel() {
       this.open = false
     },
+    daterangeChange() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.form.startDate = this.daterange[0]
+        this.form.endDate = this.daterange[1];
+      } else {
+        this.form.startDate = ''
+        this.form.endDate = ''
+      }
+    },
     reset() {
       this.form = {
         id: null,
+        ids: null,
         mc: null,
+        startDate: null,
+        endDate: null,
         bh: null,
-        kc: null,
-        kcdw: null,
-        qmrmm: null,
-        qmyy: '修改库存',
-        kcbjbz: ''
+        qmyy: '申请借阅',
+        qmrmm: null
       }
       this.resetForm("form")
     },
@@ -126,18 +139,18 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
-      this.form.kc = row.kc
-      this.form.kcdw = row.kcdw
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          xgkc(this.form).then(response => {
+
+          jy(this.form).then(response => {
             this.open = false
             this.$emit('callback')
           })
         }
+
       })
     }
   }
diff --git a/src/views/business/resource/gsp/comps/mjy/Sd.vue b/src/views/business/resource/gsp/comps/rkjl/Sd.vue
similarity index 94%
rename from src/views/business/resource/gsp/comps/mjy/Sd.vue
rename to src/views/business/resource/gsp/comps/rkjl/Sd.vue
index d11d974..b7de010 100644
--- a/src/views/business/resource/gsp/comps/mjy/Sd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Sd.vue
@@ -5,14 +5,14 @@ G<template>
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-          <el-row >
+          <!-- <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
-        <div v-if="!isBatch">
-          <el-row>
+         <div v-if="!isBatch">
+          <!-- <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
@@ -27,7 +27,7 @@ G<template>
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
         <el-row>
           <el-col :span="24">
@@ -71,7 +71,7 @@ G<template>
 </template>
 
 <script>
-import { sd, plsd } from "@/api/business/mjy/mjy"
+import { sd, plsd } from "@/api/business/gsp/gspRkjl"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -118,7 +118,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定麻精药',
+        qmyy: '锁定发放记录',
         qmrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gsp/comps/rkjl/SelectList.vue b/src/views/business/resource/gsp/comps/rkjl/SelectList.vue
new file mode 100644
index 0000000..8896bbd
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/rkjl/SelectList.vue
@@ -0,0 +1,56 @@
+G<template>
+  <div class="app-container">
+    <el-table :data="selectList" border>
+       <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+          :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
+          :show-overflow-tooltip="true" />
+           <el-table-column :label="$t('page.business.resource.mjy.jlzt')" align="center" width="100px" fixed="right">
+          <template slot-scope="scope">
+            <span v-if="scope.row.jlzt == 1">{{ $t('page.business.resource.jlzt.wsd') }}</span>
+            <span v-if="scope.row.jlzt == 3">{{ $t('page.business.resource.jlzt.ysd') }}</span>
+            <span v-if="scope.row.jlzt == 5">{{ $t('page.business.resource.jlzt.dgd') }}</span>
+            <span v-if="scope.row.jlzt == 7">{{ $t('page.business.resource.jlzt.gd') }}</span>
+            <span v-if="scope.row.jlzt == 9">{{ $t('page.business.resource.jlzt.djd') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" width="100px"  fixed="right">
+          <template slot-scope="scope">
+            <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.jyzt.wjy') }}</span>
+            <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.jyzt.djy') }}</span>
+            <span v-if="scope.row.jyzt == 5">{{ $t('page.business.resource.jyzt.jyz') }}</span>
+          </template>
+        </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "SelectList",
+  data() {
+    return {
+      selectList: []
+    }
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        this.selectList = v || []
+      }
+    },
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xq.vue b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
new file mode 100644
index 0000000..6dd1ad1
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/rkjl/Xq.vue
@@ -0,0 +1,156 @@
+<template>
+  <!-- 详情 -->
+  <div class="detail-container">
+    <div class="detail-top">
+      <div class="left-top">
+        <img src="@/assets/images/back.png" @click="cancel()" />
+        <div class="left-title"></div>
+      </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.gsp.gsprkjl')
+      }}<img src="@/assets/images/detail-title.png" /></div>
+    <div class="detail-content">
+      <div class="content-left">
+        <div class="content-title">
+          <div class="line"></div>
+          <div class="subtitle"> 基本信息</div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gsp.mc') }}</div>
+            <el-input type="text" :value="form.mc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="left-title">{{ $t('page.business.resource.gsp.ph') }}</div>
+            <el-input type="text" :value="form.ph" maxlength="50" disabled />
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
+            <el-input type="text" :value="form.gg" maxlength="50" disabled>
+              <template slot="append">{{ form.ggdw }}</template>
+            </el-input>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gsp.rksj') }}</div>
+            <el-input type="text" :value="form.rksj" maxlength="50" disabled>
+            </el-input>
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gsp.rkl') }}</div>
+            <el-input type="text" :value="form.rkl" maxlength="50" disabled>
+              <template slot="append">{{ form.rkdw }}</template>
+            </el-input>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gsp.zysx') }}</div>
+            <el-input type="text" :value="form.zysx"  disabled />
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gsp.gdsqr') }}</div>
+            <el-input type="text" :value="form.gdsqrMc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gsp.cjsj') }}</div>
+            <el-input type="text" :value="form.createTime" maxlength="50" disabled />
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gsp.jlzt') }}</div>
+            <el-select v-model="form.jlzt" disabled style="width: 100%;">
+              <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
+            </el-select>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gsp.jyzt') }}</div>
+            <el-select v-model="form.jyzt" disabled style="width: 100%;">
+              <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
+            </el-select>
+          </div>
+        </div>
+      </div>
+      <div class="content-right">
+        <div class="content-title">
+          <div class="line"></div>
+          <div class="subtitle"> 稽查轨迹日志</div>
+        </div>
+        <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+        <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { info, jcgjList } from "@/api/business/gsp/gspRkjl"
+import JcgjList from "@/views/business/comps/common/JcgjList";
+
+export default {
+  name: "Xq",
+  components: { JcgjList },
+  data() {
+    return {
+      form: {},
+      jcgjTotal: 0,
+      jcgjList: [],
+      open: false,
+      queryJcgjParams: {
+        pageNum: 1,
+        ffjlId: null,
+        pageSize: 5,
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    exportExcel() {
+      alert('todo')
+    },
+    cancel() {
+      this.open = false
+      this.$emit('callback')
+    },
+    getJjcgjList(val) {
+      this.$modal.loading()
+      jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        if (this.queryJcgjParams.pageNum == 1) {
+          this.$refs.jcgjList.init(this.jcgjList)
+        } else {
+          this.$refs.jcgjList.add(this.jcgjList)
+        }
+        this.$modal.closeLoading()
+      })
+    },
+    show(row) {
+      this.$modal.loading()
+      this.queryJcgjParams.ffjlId = row.id
+      info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.open = true
+        this.getJjcgjList()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
new file mode 100644
index 0000000..08594a3
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
@@ -0,0 +1,219 @@
+G<template>
+  <div>
+    <!-- 新增弹窗 -->
+    <el-dialog :title="$t('form.add')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <!-- 名称 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 编号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="ph">
+              <el-input type="text" v-model="form.ph" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 规格 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
+              <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 规格单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.ggdw"
+              dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
+          </el-col>
+          <!-- 入库时间 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.rksj')" prop="rksj">
+              <el-date-picker v-model="form.rksj" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 库存量 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.rkl')" prop="rkl">
+              <el-input type="number" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 库存量单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.rkdw"
+              dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
+          </el-col>
+          <!-- 存储条件 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 注意事项 -->
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.zysx')" prop="zysx">
+              <el-input type="textarea" :rows="2" v-model="form.zysx" maxlength="500"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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.signerPsw')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :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="qmbz">
+              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </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 { xz } from "@/api/business/gsp/gspRkjl"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "Xz",
+  components: { BusinessSelect },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        mc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        bh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ph: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        gg: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        yxq: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rksj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zysx: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        mc: null,
+        bh: null,
+        nd: null,
+        nddw: null,
+        sxrq: null,
+        cctj: null,
+        ccwz: null,
+        qmrmm: null,
+        qmyy: '新增供试品入库记录',
+        bjbz: ''
+      }
+      this.resetForm("form")
+    },
+    show() {
+      this.reset()
+
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          xz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue
new file mode 100644
index 0000000..b4036f2
--- /dev/null
+++ b/src/views/business/resource/gsp/comps/rkjlList.vue
@@ -0,0 +1,324 @@
+<template>
+  <div>
+    <div>
+      <!-- 入库记录列表 -->
+      <div class="ffjl" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
+          <el-row>
+            <el-col :span="24">
+              <!-- 名称 -->
+              <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'">
+                <el-input v-model="queryParams.mc" clearable @change="handleQuery"
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 编号 -->
+              <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'">
+                <el-input v-model="queryParams.bh" clearable @change="handleQuery"
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 规格 -->
+              <el-form-item :label="$t('page.business.resource.gsp.gg') + '：'">
+                <el-input v-model="queryParams.gg" clearable @change="handleQuery"
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 记录状态 -->
+              <el-form-item :label="$t('page.business.resource.gsp.jlzt') + '：'">
+                <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="handleQuery">
+                  <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
+                </el-select>
+              </el-form-item>
+              <!-- 借阅状态 -->
+              <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'">
+                <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="handleQuery">
+                  <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+                  <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+                  <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
+                </el-select>
+              </el-form-item>
+              <!-- 入库日期 -->
+              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'">
+                <el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
+                  range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                  value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <!-- 新增 -->
+            <el-button type="primary"  @click="handleXz" >{{
+                $t('form.add') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导入 -->
+            <el-button type="primary"  @click="handleXz" >{{
+                $t('page.business.resource.gsp.dr') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量归档 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd">{{
+                $t('page.business.resource.gsp.plgd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量锁定 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd">{{
+                $t('page.business.resource.gsp.plsd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导出 -->
+            <el-button type="primary" :disabled="multiple" @click="handleDc"
+              v-hasPermi="['business:resource:mjy:ffjldc']">{{
+                $t('form.export') }}</el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" />
+          <el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.gg }} {{ scope.row.ggdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gsp.rksj')" align="center" prop="rksj" width="150px"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.rkl')" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.rkl }} {{ scope.row.rkdl }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gsp.cctj')" align="center" prop="cctj" />
+          <el-table-column :label="$t('page.business.resource.gsp.zysx')" align="center" prop="zysx"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gsp.jlzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jlzt == 1">{{ $t('page.business.resource.resource.jlzt.wsd') }}</span>
+              <span v-if="scope.row.jlzt == 3">{{ $t('page.business.resource.resource.jlzt.ysd') }}</span>
+              <span v-if="scope.row.jlzt == 5">{{ $t('page.business.resource.resource.jlzt.dgd') }}</span>
+              <span v-if="scope.row.jlzt == 7">{{ $t('page.business.resource.resource.jlzt.gd') }}</span>
+              <span v-if="scope.row.jlzt == 9">{{ $t('page.business.resource.resource.jlzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gsp.jyzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.resource.resource.jyzt.jyz') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('form.operate')" fixed="right" align="center"
+            class-name="small-padding fixed-width" width="250px">
+            <template slot-scope="scope">
+              <!-- 编辑 -->
+              <el-button v-if="scope.row.jlzt == 1" type="text" @click="handleBj(scope.row)">{{
+                  $t('form.edit') }}</el-button>
+              <!-- 详情 -->
+              <el-button v-if="scope.row.jlzt == 1 || scope.row.jlzt == 3 || scope.row.jlzt == 7" type="text"
+                @click="handleXq(scope.row)" >{{
+                  $t('page.business.resource.gsp.detail') }}</el-button>
+              <!-- 锁定 -->
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)">{{
+                  $t('page.business.resource.gsp.lock') }}</el-button>
+              <!-- 解锁 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)">{{
+                  $t('page.business.resource.gsp.unlock') }}</el-button>
+              <!-- 归档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)">{{
+                  $t('page.business.resource.gsp.guidang') }}</el-button>
+              <!-- 解档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)">{{
+                  $t('page.business.resource.gsp.jiedang') }}</el-button>
+              <!-- 借阅 -->
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)">{{
+                  $t('page.business.resource.gsp.jieyue') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <!-- 锁定 -->
+      <Sd key="Sd" ref="Sd" @callback="handleQuery" />
+      <!-- 解锁 -->
+      <Js key="Js" ref="Js" @callback="handleQuery" />
+      <!-- 归档 -->
+      <Gd key="Gd" ref="Gd" @callback="handleQuery" />
+      <!-- 解档 -->
+      <Jd key="Jd" ref="Jd" @callback="handleQuery" />
+      <!-- 借阅 -->
+      <Jy key="Jy" ref="Jy" @callback="handleQuery" />
+      <!-- 借阅 -->
+      <Xq key="Xq" v-show="showDetail" ref="Xq" @callback="closeXq" />
+      <!-- 编辑 -->
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
+      <!-- 新增 -->
+      <Xz key="Xz" ref="Xz" @callback="handleQuery" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { list } from "@/api/business/gsp/gspRkjl"
+import Sd from "./rkjl/Sd";
+import Jy from "./rkjl/Jy";
+import Js from "./rkjl/Js";
+import Gd from "./rkjl/Gd";
+import Jd from "./rkjl/Jd";
+import Xq from "./rkjl/Xq";
+import Xz from "./rkjl/Xz";
+import Bj from "./rkjl/Bj";
+
+export default {
+  name: "FfjlList",
+  components: { Sd, Js, Gd, Jd, Jy, Xq,  Xz, Bj },
+  data() {
+    return {
+      daterangeCk: [],
+      daterangeRk: [],
+      loading: true,
+      showDetail: false,
+      single: true,
+      multiple: true,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        mdId: null,
+        jlzt: null,
+        jyzt: null,
+        bh: null,
+        startDateCk: null,
+        endDateCk: null,
+        startDateRk: null,
+        endDateRk: null,
+      },
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    //导出
+    handleDc() {
+
+    },
+    handleBj(row) {
+      this.$refs.Bj.show(row)
+    },
+    handleXz() {
+      this.$refs.Xz.show()
+    },
+    //加签
+    handleJq(row) {
+      this.$refs.Jq.show(row)
+    },
+    //锁定
+    handleSd(row) {
+      this.$refs.Sd.show(row)
+    },
+    //解锁
+    handleJs(row) {
+      this.$refs.Js.show(row)
+    },
+    //批量归档
+    handlePlgd() {
+      this.$refs.Gd.showBatch(this.selectList)
+    },
+    //批量锁定
+    handlePlsd() {
+      this.$refs.Sd.showBatch(this.selectList)
+    },
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //归档
+    handleGd(row) {
+      this.$refs.Gd.show(row)
+    },
+    //借阅
+    handleJy(row) {
+      this.$refs.Jy.show(row)
+    },
+    //解档
+    handleJd(row) {
+      this.$refs.Jd.show(row)
+    },
+    //是否可勾选
+    checkSelectable(row) {
+      return true;
+    },
+    //获取列表
+    getList() {
+      if (this.daterangeCk != null && this.daterangeCk.length > 0) {
+        this.queryParams.startDateCk = this.daterangeCk[0]
+        this.queryParams.endDateCk = moment().add(this.daterangeCk[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDateCk = ''
+        this.queryParams.endDateCk = ''
+      }
+      if (this.daterangeRk != null && this.daterangeRk.length > 0) {
+        this.queryParams.startDateRk = this.daterangeRk[0]
+        this.queryParams.endDateRk = moment().add(this.daterangeRk[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDateRk = ''
+        this.queryParams.endDateRk = ''
+      }
+      this.loading = true
+      list(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    //勾选回调
+    handleSelectionChange(selection) {
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+      this.selectList = selection
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.ffjl {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/gsp/index.vue b/src/views/business/resource/gsp/index.vue
index 9d77687..03f04de 100644
--- a/src/views/business/resource/gsp/index.vue
+++ b/src/views/business/resource/gsp/index.vue
@@ -9,27 +9,30 @@
       </div>
 
       <div class="content-box">
-        <mjyList v-if="active === 'mjyList'" @showDetail="showDetailCallback" />
+        <gspList v-if="active === 'gspList'" @showDetail="showDetailCallback" />
         <ffjlList v-if="active === 'ffjlList'" @showDetail="showDetailCallback" />
+        <rkjlList v-if="active === 'rkjlList'" @showDetail="showDetailCallback" />
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import mjyList from "./comps/mjyList";
+import gspList from "./comps/gspList";
 import ffjlList from "./comps/ffjlList";
+import rkjlList from "./comps/rkjlList";
 export default {
-  name: 'Gyzj',
-  components: { mjyList, ffjlList },
+  name: 'Gsp',
+  components: { gspList, ffjlList, rkjlList },
   data() {
     return {
       showDetail: false,
       tabList: [
-        { key: 'mjyList', name: this.$t('page.business.resource.mjy.mjygl') },
-        { key: 'ffjlList', name: this.$t('page.business.resource.mjy.ffhsjl') },
+        { key: 'gspList', name: this.$t('page.business.resource.gsp.gspgl') },
+        { key: 'rkjlList', name: this.$t('page.business.resource.gsp.gsprkjl') },
+        { key: 'ffjlList', name: this.$t('page.business.resource.gsp.ffhsjl') },
       ],
-      active: 'mjyList',
+      active: 'gspList',
     }
   },
   created() { },
diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue
index 83bbc83..d0254a1 100644
--- a/src/views/business/resource/sj/comps/Bj.vue
+++ b/src/views/business/resource/sj/comps/Bj.vue
@@ -1,54 +1,67 @@
 G<template>
-  <div >
+  <div>
     <!-- 编辑弹窗 -->
-    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="700px" 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>
+        <template>
           <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
+            <!-- 名称 -->
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.sj.mc')" prop="mc">
+                <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+            <!-- 编号 -->
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.sj.bh')" prop="bh">
+                <el-input type="text" v-model="form.bh" 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-col :span="8">
+              <el-form-item :label="$t('page.business.resource.sj.nd')" prop="nd">
+                <el-input type="text" v-model="form.nd" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <BusinessSelect dictType="system_business_zldw" v-model="form.nndw" />
+            </el-col>
+            <el-col :span="12">
+              <!-- 失效日 -->
+              <el-form-item :label="$t('page.business.resource.sj.sxr')" prop="sxr">
+                <el-date-picker v-model="form.sxr" type="datetime" format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+                </el-date-picker>
               </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-col :span="12">
+            <!-- 存储条件 -->
+            <el-form-item :label="$t('page.business.resource.sj.cctj')" prop="cctj">
+              <BusinessSelect dictType="system_business_cctj" v-model="form.cctj" />
             </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-col :span="12">
+            <!-- 存储位置 -->
+            <el-form-item :label="$t('page.business.resource.sj.ccwz')" prop="ccwz">
+              <BusinessSelect dictType="system_business_ccwz" v-model="form.ccwz" />
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')">
+              <el-input type="text" v-model="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -62,6 +75,15 @@ G<template>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="qmbz">
+              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </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>
@@ -72,13 +94,14 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { sj_save } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
-  name: "MjyBj",
-  components: { SelectList },
+  name: "SjBj",
+  components: { SelectList, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -119,7 +142,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: '编辑',
         sdrmm: null
       }
       this.resetForm("form")
@@ -137,18 +160,10 @@ export default {
     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')
-            })
-          }
-
+          sj_save(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/vue.config.js b/vue.config.js
index bbd8cf9..5e39e4b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-         // target: `http://localhost:8080`,
-        target: `http://39.99.251.173:8080`,
+         target: `http://localhost:8080`,
+        // target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''