diff --git a/src/App.vue b/src/App.vue
index 6bc8870..7bbfe16 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -169,7 +169,7 @@ export default {
 
       img {
         height: 16px;
-        margin-right: 20px;
+        margin-right: 10px;
         cursor: pointer;
       }
 
diff --git a/src/api/business/gyzj/gyzj.js b/src/api/business/gyzj/gyzj.js
new file mode 100644
index 0000000..6200543
--- /dev/null
+++ b/src/api/business/gyzj/gyzj.js
@@ -0,0 +1,200 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/system/business/gyzj/list',
+    method: 'get',
+    params: query
+  })
+}
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/gyzj/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+// 详情
+export function info(query) {
+  return request({
+    url: '/system/business/gyzj/info',
+    method: 'get',
+    params: query
+  })
+}
+
+// 编辑
+export function bj(data) {
+  return request({
+    url: '/system/business/gyzj/bj',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核编辑
+export function shbj(data) {
+  return request({
+    url: '/system/business/gyzj/shbj',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存
+export function xgkc(data) {
+  return request({
+    url: '/system/business/gyzj/xgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核修改库存
+export function shxgkc(data) {
+  return request({
+    url: '/system/business/gyzj/shxgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 解锁
+export function js(data) {
+  return request({
+    url: '/system/business/gyzj/js',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 锁定
+export function sd(data) {
+  return request({
+    url: '/system/business/gyzj/sd',
+    method: 'post',
+    data: data
+  })
+}
+
+
+//批量锁定
+export function plsd(data) {
+  return request({
+    url: '/system/business/gyzj/plsd',
+    method: 'post',
+    data: data
+  })
+}
+
+//处置容器
+export function czrq(data) {
+  return request({
+    url: '/system/business/gyzj/czrq',
+    method: 'post',
+    data: data
+  })
+}
+
+//批量处置容器
+export function plczrq(data) {
+  return request({
+    url: '/system/business/gyzj/plczrq',
+    method: 'post',
+    data: data
+  })
+}
+
+
+//处置药剂
+export function czyj(data) {
+  return request({
+    url: '/system/business/gyzj/czyj',
+    method: 'post',
+    data: data
+  })
+}
+
+//批量处置药剂
+export function plczyj(data) {
+  return request({
+    url: '/system/business/gyzj/plczyj',
+    method: 'post',
+    data: data
+  })
+}
+
+//归档
+export function gd(data) {
+  return request({
+    url: '/system/business/gyzj/gd',
+    method: 'post',
+    data: data
+  })
+}
+
+//批量归档
+export function plgd(data) {
+  return request({
+    url: '/system/business/gyzj/plgd',
+    method: 'post',
+    data: data
+  })
+}
+//发放
+export function ff(data) {
+  return request({
+    url: '/system/business/gyzj/ff',
+    method: 'post',
+    data: data
+  })
+}
+//批量发放
+export function plff(data) {
+  return request({
+    url: '/system/business/gyzj/plff',
+    method: 'post',
+    data: data
+  })
+}
+
+//钥匙发放
+export function ysff(data) {
+  return request({
+    url: '/system/business/gyzj/ysff',
+    method: 'post',
+    data: data
+  })
+}
+
+//归还
+export function gh(data) {
+  return request({
+    url: '/system/business/gyzj/gh',
+    method: 'post',
+    data: data
+  })
+}
+
+//台账列表
+export function tzList(query) {
+  return request({
+    url: '/system/business/gyzj/tzList',
+    method: 'get',
+    params: query
+  })
+}
+
+//解档
+export function jd(data) {
+  return request({
+    url: '/system/business/gyzj/jd',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/api/business/gyzj/gyzjFfjl.js b/src/api/business/gyzj/gyzjFfjl.js
new file mode 100644
index 0000000..4f88e14
--- /dev/null
+++ b/src/api/business/gyzj/gyzjFfjl.js
@@ -0,0 +1,91 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/system/business/gyzjFfjl/list',
+    method: 'get',
+    params: query
+  })
+}
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/gyzjFfjl/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详情
+export function info(query) {
+  return request({
+    url: '/system/business/gyzjFfjl/info',
+    method: 'get',
+    params: query
+  })
+}
+// 解锁
+export function js(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/js',
+    method: 'post',
+    data: data
+  })
+}
+// 锁定
+export function sd(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/sd',
+    method: 'post',
+    data: data
+  })
+}
+// 锁定
+export function plsd(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/plsd',
+    method: 'post',
+    data: data
+  })
+}
+//归档
+export function gd(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/gd',
+    method: 'post',
+    data: data
+  })
+}
+//解档
+export function jd(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/jd',
+    method: 'post',
+    data: data
+  })
+}
+//借阅
+export function jy(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/jy',
+    method: 'post',
+    data: data
+  })
+}
+//归档
+export function plgd(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/plgd',
+    method: 'post',
+    data: data
+  })
+}
+//加签
+export function jq(data) {
+  return request({
+    url: '/system/business/gyzjFfjl/jq',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/lang/en.js b/src/lang/en.js
index b6a2e36..aa8513f 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -20,6 +20,8 @@ import yq from './en/business/resource/yq/yq'
 import zcg from './en/business/resource/zcg/zcg'
 // 麻精药
 import mjy from './en/business/resource/mjy/mjy'
+// 给药制剂
+import gyzj from './en/business/resource/gyzj/gyzj'
 // 试剂库存
 import sj from './en/business/resource/sj/sj'
 export default {
@@ -103,7 +105,7 @@ export default {
       template
     },
     business: {
-      zykgl: {
+      resource: {
         zjzt: {
           rk: '入库',
           yff: '已发放',
@@ -127,7 +129,8 @@ export default {
         zcg,
         mjy,
         yq,
-        sj
+        sj,
+        gyzj
       },
       study: study
     }
diff --git a/src/lang/en/business/resource/gyzj/gyzj.js b/src/lang/en/business/resource/gyzj/gyzj.js
new file mode 100644
index 0000000..9706e1e
--- /dev/null
+++ b/src/lang/en/business/resource/gyzj/gyzj.js
@@ -0,0 +1,84 @@
+export default {
+   mc:'名称',
+    bh:'编号',
+    jyzt:'借阅状态',
+    zjzt:'制剂状态',
+    jlzt:'记录状态',
+    sxrq:'失效日期',
+    nd:'浓度',
+    nddw:'浓度单位',
+    kcl:'库存量',
+    kc:'库存',
+    kcdw:'库存单位',
+    zcg:'暂存柜',
+    cctj:'存储条件',
+    ccwz:'存储位置',
+    cksj:'出库时间',
+    rksj:'入库时间',
+    ckjz:'出库净重',
+    rkjz:'入库净重',
+    syl:'使用量',
+    lqr1:'领取人1',
+    lqr2:'领取人2',
+    kgy1:'库管员1',
+    kgy2:'库管员2',
+
+    plff:'批量发放',
+    plczyj:'批量处置药剂',
+    plczrq:'批量处置容器',
+    ysff:'钥匙发放',
+    plsd:'批量锁定',
+    plgd:'批量归档',
+    lock:'锁定',
+    unlock:'解锁',
+    detail:'详情',
+    guidang:'归档',
+    jiedang:'解档',
+    jieyue:'借阅',
+    guihuan:'归还',
+    fafang:'发放',
+    ysff:'钥匙发放',
+    czrq:'处置容器',
+    czyj:'处置药剂',
+    yuanyin:'原因',
+    xgkc:'修改库存',
+    shxgkc:'审核修改库存',
+    shbj:'审核编辑',
+    clr:'处理人',
+    czfs:'处置方式',
+    fhr:'复核人',
+    xgbz:'修改备注',
+    jdr:'监督人',
+    xgr:'修改人',
+    czl:'处置量',
+    ffr:'发放人',
+    ffr1:'发放人1',
+    ffr2:'发放人2',
+    zytj:'转移条件',
+    md:'目的',
+    ckmz:'出库毛重',
+    ckl:'出库量',
+    ckldw:'出库单位',
+    ffzytj:'转移条件',
+    ckmz:'出库毛重',
+    ckmzdw:'出库毛重单位',
+    ys1lrq:'钥匙1领取人',
+    ys2lrq:'钥匙2领取人',
+    sssy:'所属试验',
+    ssbd:'所属表单',
+    bdssr:'表单所属人',
+    syr:'使用人',
+    lqghr:'领取/归还人',
+    ffjsr:'发放/接收人',
+    czlx:'操作类型',
+    czl:'操作量',
+    bzyy:'备注/原因',
+    ccsj:'操作时间',
+    cksj:'出库时间',
+    rksj:'入库时间',
+    jiaqian:'加签',
+    gyzjgl:'给药制剂管理',
+    ffhsjl:'发放回收记录',
+
+  
+}
\ No newline at end of file
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 71baf86..15e0fa6 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -20,6 +20,8 @@ import yq from './zh/business/resource/yq/yq'
 import zcg from './zh/business/resource/zcg/zcg'
 // 麻精药
 import mjy from './zh/business/resource/mjy/mjy'
+// 给药制剂
+import gyzj from './zh/business/resource/gyzj/gyzj'
 // 试剂库存
 import sj from './zh/business/resource/sj/sj'
 export default {
@@ -100,7 +102,7 @@ export default {
       template
     },
     business: {
-      zykgl: {
+      resource: {
         zjzt: {
           rk: '入库',
           yff: '已发放',
@@ -124,7 +126,8 @@ export default {
         zcg,
         mjy,
         yq,
-        sj
+        sj,
+        gyzj
       },
       study: study
     }
diff --git a/src/lang/zh/business/resource/gyzj/gyzj.js b/src/lang/zh/business/resource/gyzj/gyzj.js
new file mode 100644
index 0000000..587e823
--- /dev/null
+++ b/src/lang/zh/business/resource/gyzj/gyzj.js
@@ -0,0 +1,85 @@
+export default {
+    mc:'名称',
+    bh:'编号',
+    jyzt:'借阅状态',
+    zjzt:'制剂状态',
+    jlzt:'记录状态',
+    sxrq:'失效日期',
+    nd:'浓度',
+    nddw:'浓度单位',
+    kcl:'库存量',
+    kc:'库存',
+    kcdw:'库存单位',
+    zcg:'暂存柜',
+    cctj:'存储条件',
+    ccwz:'存储位置',
+    cksj:'出库时间',
+    rksj:'入库时间',
+    ckjz:'出库净重',
+    rkjz:'入库净重',
+    syl:'使用量',
+    lqr1:'领取人1',
+    lqr2:'领取人2',
+    kgy1:'库管员1',
+    kgy2:'库管员2',
+
+    plff:'批量发放',
+    plczyj:'批量处置药剂',
+    plczrq:'批量处置容器',
+    ysff:'钥匙发放',
+    plsd:'批量锁定',
+    plgd:'批量归档',
+    lock:'锁定',
+    unlock:'解锁',
+    detail:'详情',
+    guidang:'归档',
+    jiedang:'解档',
+    jieyue:'借阅',
+    guihuan:'归还',
+    fafang:'发放',
+    ysff:'钥匙发放',
+    czrq:'处置容器',
+    czyj:'处置药剂',
+    yuanyin:'原因',
+    xgkc:'修改库存',
+    shxgkc:'审核修改库存',
+    shbj:'审核编辑',
+    clr:'处理人',
+    czfs:'处置方式',
+    fhr:'复核人',
+    xgbz:'修改备注',
+    jdr:'监督人',
+    xgr:'修改人',
+    czl:'处置量',
+    ffr:'发放人',
+    ffr1:'发放人1',
+    ffr2:'发放人2',
+    zytj:'转移条件',
+    md:'目的',
+    ckmz:'出库毛重',
+    ckl:'出库量',
+    ckldw:'出库单位',
+    ffzytj:'转移条件',
+    ckmz:'出库毛重',
+    ckmzdw:'出库毛重单位',
+    ys1lrq:'钥匙1领取人',
+    ys2lrq:'钥匙2领取人',
+    sssy:'所属试验',
+    ssbd:'所属表单',
+    bdssr:'表单所属人',
+    syr:'使用人',
+    lqghr:'领取/归还人',
+    ffjsr:'发放/接收人',
+    czlx:'操作类型',
+    czl:'操作量',
+    bzyy:'备注/原因',
+    ccsj:'操作时间',
+    cksj:'出库时间',
+    rksj:'入库时间',
+    jiaqian:'加签',
+    gyzjgl:'给药制剂管理',
+    ffhsjl:'发放回收记录',
+
+  
+  
+}
\ No newline at end of file
diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy/mjy.js
index 24130c4..8497f56 100644
--- a/src/lang/zh/business/resource/mjy/mjy.js
+++ b/src/lang/zh/business/resource/mjy/mjy.js
@@ -77,6 +77,8 @@ export default {
     cksj:'出库时间',
     rksj:'入库时间',
     jiaqian:'加签',
+    mjygl:'麻精药管理',
+    ffhsjl:'发放回收记录',
 
   
   
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
new file mode 100644
index 0000000..867546d
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
@@ -0,0 +1,156 @@
+G<template>
+  <div>
+    <!-- 锁定弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <SelectList :value="selectList" />
+            </el-col>
+          </el-row>
+        </div>
+         <div v-if="!isBatch">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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>
+        </div>
+        <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/gyzj/gyzjFfjl"
+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/gyzj/comps/ffjl/Jd.vue b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
new file mode 100644
index 0000000..c518aa9
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
@@ -0,0 +1,144 @@
+G<template>
+  <div >
+    <!-- 解档弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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/gyzj/gyzjFfjl"
+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/gyzj/comps/ffjl/Jq.vue b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
new file mode 100644
index 0000000..2f1df04
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
@@ -0,0 +1,123 @@
+G<template>
+  <div >
+    <!-- 加签弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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 { jq } from "@/api/business/gyzj/gyzjFfjl"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Jq",
+  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) {
+            jq(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Js.vue b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
new file mode 100644
index 0000000..de94768
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
@@ -0,0 +1,123 @@
+G<template>
+  <div >
+    <!-- 解锁弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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/gyzj/gyzjFfjl"
+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/gyzj/comps/ffjl/Jy.vue b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
new file mode 100644
index 0000000..2b8dea5
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
@@ -0,0 +1,125 @@
+G<template>
+  <div >
+    <!-- 借阅弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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 { jy } from "@/api/business/gyzj/gyzjFfjl"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Jy",
+  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) {
+         
+            jy(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
new file mode 100644
index 0000000..257bbdc
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
@@ -0,0 +1,156 @@
+G<template>
+  <div>
+    <!-- 锁定弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <SelectList :value="selectList" />
+            </el-col>
+          </el-row>
+        </div>
+         <div v-if="!isBatch">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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>
+        </div>
+        <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/gyzj/gyzjFfjl"
+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/gyzj/comps/ffjl/SelectList.vue b/src/views/business/resource/gyzj/comps/ffjl/SelectList.vue
new file mode 100644
index 0000000..5ec40a6
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/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.gyzj.mc')" align="left" prop="mc"
+          :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
+          :show-overflow-tooltip="true" />
+           <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.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/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
new file mode 100644
index 0000000..d5b6844
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
@@ -0,0 +1,203 @@
+<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('page.business.study.cancel') }}</el-button>
+        <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
+      </div>
+    </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.gyzj.mc') }}</div>
+            <el-input type="text" :value="form.mc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.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.gyzj.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-select>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.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-select>
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gyzj.zcg') }}</div>
+            <el-input type="text" :value="form.zcgMc" maxlength="50" disabled />
+          </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.gyzj.md') }}</div>
+            <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.zytj') }}</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.gyzj.cksj') }}</div>
+            <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.ckjz') }}</div>
+            <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
+            }}</template>
+            </el-input>
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gyzj.lqr1') }}</div>
+            <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.lqr2') }}</div>
+            <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gyzj.kgy1') }}</div>
+            <el-input type="text" :value="form.kgy1Mc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.kgy2') }}</div>
+            <el-input type="text" :value="form.kgy2Mc" maxlength="50" disabled />
+          </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.gyzj.rksj') }}</div>
+            <el-input type="text" :value="form.ghrq" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.rkjz') }}</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.gyzj.syl') }}</div>
+            <el-input type="text" :value="form.syl" maxlength="50" disabled> <template slot="append">{{ form.syldw
+            }}</template>
+            </el-input>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.zytj') }}</div>
+            <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
+          </div>
+        </div>
+      </div>
+      <div class="content-right">
+        <div class="content-title">
+          <div class="line"></div>
+          <div class="subtitle"> 稽查轨迹日志</div>
+        </div>
+        <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+
+        <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+          @pagination="getJjcgjList" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { info, jcgjList } from "@/api/business/gyzj/gyzjFfjl"
+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: 10,
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    exportExcel() {
+      alert('todo')
+    },
+    cancel() {
+      this.open = false
+      this.$emit('callback')
+    },
+    jcgjListHandleQuery(val) {
+      this.$modal.loading()
+      jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      })
+    },
+    getJjcgjList() {
+      jcgjList(this.queryJcgjParams).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(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/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
new file mode 100644
index 0000000..5024587
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -0,0 +1,331 @@
+<template>
+  <div>
+    <div>
+      <!-- 列表 -->
+      <div class="app-container" 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.gyzj.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.gyzj.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.gyzj.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.gyzj.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-select>
+              </el-form-item>
+              <!-- 借阅状态 -->
+              <el-form-item :label="$t('page.business.resource.gyzj.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-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.gyzj.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')"
+                  value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
+              </el-form-item>
+              <!-- 入库日期 -->
+              <el-form-item :label="$t('page.business.resource.gyzj.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-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <!-- 批量归档 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd"
+              v-hasPermi="['business:resource:gyzj:ffjlgd']">{{
+                $t('page.business.resource.gyzj.plgd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量锁定 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd"
+              v-hasPermi="['business:resource:gyzj:ffjlsd']">{{
+                $t('page.business.resource.gyzj.plsd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导出 -->
+            <el-button type="primary" :disabled="multiple" @click="handleDc"
+              v-hasPermi="['business:resource:gyzj: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.gyzj.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" prop="mdMc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.zytj')" align="center" prop="ffzytj"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.cksj')" align="center" prop="ffrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.rksj')" align="center" prop="ghrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.ckjz')" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.ckl }} {{ scope.row.ckldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.rkjz')" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.rkl }} {{ scope.row.rkldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.lqr1')" align="center" prop="lqr1Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="kgy1Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="kgy2Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.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-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:gyzj:ffjljq']">{{
+                  $t('page.business.resource.gyzj.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:gyzj:ffjlxq']">{{
+                  $t('page.business.resource.gyzj.detail') }}</el-button>
+              <!-- 锁定 -->
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjlsd']">{{
+                  $t('page.business.resource.gyzj.lock') }}</el-button>
+              <!-- 解锁 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjljs']">{{
+                  $t('page.business.resource.gyzj.unlock') }}</el-button>
+              <!-- 归档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjlgd']">{{
+                  $t('page.business.resource.gyzj.guidang') }}</el-button>
+              <!-- 解档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjljd']">{{
+                  $t('page.business.resource.gyzj.jiedang') }}</el-button>
+              <!-- 借阅 -->
+              <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjljy']">{{
+                  $t('page.business.resource.gyzj.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"/>
+      <!-- 加签 -->
+      <Jq key="Jq" ref="Jq" @callback="handleQuery" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { list } from "@/api/business/gyzj/gyzjFfjl"
+import Sd from "./ffjl/Sd";
+import Jy from "./ffjl/Jy";
+import Js from "./ffjl/Js";
+import Gd from "./ffjl/Gd";
+import Jd from "./ffjl/Jd";
+import Xq from "./ffjl/Xq";
+import Jq from "./ffjl/Jq";
+
+export default {
+  name: "FfjlList",
+  components: { Sd, Js, Gd, Jd, Jy, Xq, Jq },
+  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() {
+
+    },
+    //加签
+    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.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail=true
+      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>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
new file mode 100644
index 0000000..bc90515
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -0,0 +1,196 @@
+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.gyzj.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.gyzj.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="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.nd')" prop="nd">
+              <el-input type="number" v-model="form.nd" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.nddw')" prop="nddw">
+              <el-input type="text" v-model="form.nddw" 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.gyzj.sxrq')" prop="sxrq">
+              <el-input type="text" v-model="form.sxrq" 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.gyzj.cctj')" prop="cctj">
+              <el-input type="text" v-model="form.cctj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')" prop="ccwz">
+              <el-input type="text" v-model="form.ccwz" maxlength="50" :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.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-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="bjbz">
+              <el-input type="textarea" v-model="form.bjbz" :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 } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Bj",
+  components: { SelectList },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        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: ' ',
+          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(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
+      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/gyzj/comps/gyzj/Czrq.vue b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
new file mode 100644
index 0000000..2187fc2
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
@@ -0,0 +1,274 @@
+G<template>
+  <div>
+    <!-- 处置容器弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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('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.gyzj.fhr')" prop="fhrId">
+              <SelectDeptUser  v-model="form.fhrId" key="jdrId"/>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$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.gyzj.jdr')" prop="jdrId">
+              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$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/gyzj/gyzj"
+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/gyzj/comps/gyzj/Czyj.vue b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
new file mode 100644
index 0000000..be80836
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
@@ -0,0 +1,297 @@
+G<template>
+  <div>
+    <!-- 处置药剂弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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.gyzj.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('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.gyzj.fhr')" prop="fhrId">
+              <SelectDeptUser  v-model="form.fhrId" key="fhrId"/>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$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.gyzj.jdr')" prop="jdrId">
+              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$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/gyzj/gyzj"
+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/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
new file mode 100644
index 0000000..35970c7
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -0,0 +1,364 @@
+G<template>
+  <div>
+    <!-- 发放弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.md')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.xmId" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('form.remark')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.remark" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('form.operate')" align="center" width="100px" fixed="right">
+                  <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="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.ckmz')" prop="ckmz">
+                <el-input type="number" v-model="form.ckmz" maxlength="20" :placeholder="$t('form.placeholderInput')">
+                  <template slot="append">{{ form.ckmzdw }}</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.md')" prop="xmId">
+                <el-input type="text" v-model="form.xmId" maxlength="50" :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>
+        </div>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.lqr1')" prop="lqr1Id">
+              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="lqr1mm">
+              <el-input type="password" v-model="form.lqr1mm" 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.gyzj.lqr2')" prop="lqr2Id">
+              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="lqr2mm">
+              <el-input type="password" v-model="form.lqr2mm" 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.gyzj.ffr1')" prop="ffr1Id">
+              <SelectDeptUser  v-model="form.ffr1Id" key="ffr1Id"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="ffr1mm">
+              <el-input type="password" v-model="form.ffr1mm" 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.gyzj.ffr2')" prop="ffr2Id">
+              <SelectDeptUser  v-model="form.ffr2Id" key="ffr2Id"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="ffr2mm">
+              <el-input type="password" v-model="form.ffr2mm" 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" :value="form.qmyy" maxlength="50" disabled
+                :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 { ff, plff } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+
+export default {
+  name: "Ff",
+  components: { SelectList,SelectDeptUser },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        ffr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffr1Id: [{
+          required: true,
+          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: ' ',
+          trigger: 'blur'
+        }],
+        xmId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ckmzdw: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ckmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        xmId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zytj: [{
+          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.form.ids = val.map(item => item.id)
+      let tmp = []
+      _.forEach(val, function (item) {
+        tmp.push({
+          id: item.id,
+          mc: item.mc,
+          bh: item.bh,
+          ckmzdw: item.kcdw,
+          zytj: null,
+          ckmz: null,
+          xmId: null,
+          remark: null,
+        })
+      })
+      this.selectList = tmp
+      this.open = true
+    },
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        ids: null,
+        mc: null,
+        bh: null,
+        ckmzdw: null,
+        zytj: null,
+        xmId: null,
+        ckmz: null,
+        lqr1Id: null,
+        lqr2Id: null,
+        lqr1mm: null,
+        lqr2mm: null,
+        ffr1Id: null,
+        ffr1mm: null,
+        ffr2Id: null,
+        ffr2mm: null,
+        xmId: null,
+        qmyy: '领取发放',
+        qmrmm: null,
+        remark: 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.ckmzdw = 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 {
+              plff(params).then(response => {
+                this.open = false
+                this.$emit('callback')
+              })
+            }
+          } else {
+            ff(params).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
new file mode 100644
index 0000000..c28f52d
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
@@ -0,0 +1,156 @@
+G<template>
+  <div>
+    <!-- 归档弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.guidang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <SelectList :value="selectList" />
+            </el-col>
+          </el-row>
+        </div>
+         <div v-if="!isBatch">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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>
+        </div>
+        <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/gyzj/gyzj"
+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/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
new file mode 100644
index 0000000..1b56e50
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -0,0 +1,129 @@
+G<template>
+  <div>
+    <!-- 归还弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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 { gh } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Gh",
+  components: {  },
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      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) {
+          
+            gh(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
new file mode 100644
index 0000000..0b65ea2
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
@@ -0,0 +1,157 @@
+G<template>
+  <div >
+    <!-- 解档弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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">
+           <div :style="isBatch ? 'display:block' : 'display:none'">
+           <el-alert :title="$t('page.business.resource.gyzj.jdts') " type="error" :closable="false">
+          </el-alert>
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <SelectList :value="selectList"/>
+            </el-col>
+          </el-row>
+        </div>
+         <div v-if="!isBatch">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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>
+        </div>
+        <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/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Jd",
+  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) {
+            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/gyzj/comps/gyzj/Js.vue b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
new file mode 100644
index 0000000..7962037
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
@@ -0,0 +1,123 @@
+G<template>
+  <div >
+    <!-- 解锁弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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/gyzj/gyzj"
+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/gyzj/comps/gyzj/Jy.vue b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
new file mode 100644
index 0000000..9ca1d7e
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
@@ -0,0 +1,157 @@
+G<template>
+  <div >
+    <!-- 借阅弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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'">
+           <el-alert :title="$t('page.business.resource.gyzj.jdts') " type="error" :closable="false">
+          </el-alert>
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <SelectList :value="selectList"/>
+            </el-col>
+          </el-row>
+        </div>
+          <div v-if="!isBatch">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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>
+        </div>
+        <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/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Jy",
+  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) {
+            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/gyzj/comps/gyzj/Sd.vue b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
new file mode 100644
index 0000000..eceb15d
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
@@ -0,0 +1,156 @@
+G<template>
+  <div>
+    <!-- 锁定弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-row >
+            <el-col :span="24">
+              <SelectList :value="selectList" />
+            </el-col>
+          </el-row>
+        </div>
+        <div v-if="!isBatch">
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.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>
+        </div>
+        <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/gyzj/gyzj"
+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/gyzj/comps/gyzj/SelectList.vue b/src/views/business/resource/gyzj/comps/gyzj/SelectList.vue
new file mode 100644
index 0000000..8608efe
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/SelectList.vue
@@ -0,0 +1,55 @@
+G<template>
+  <div class="app-container">
+    <el-table :data="selectList" border>
+      <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
+       <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center">
+            <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>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.jyzt')" align="center" >
+            <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/gyzj/comps/gyzj/Shbj.vue b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
new file mode 100644
index 0000000..686f3fb
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
@@ -0,0 +1,223 @@
+G<template>
+  <div>
+    <!-- 审核编辑弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.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.gyzj.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.gyzj.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.gyzj.nd')" prop="nd">
+              <el-input type="text" v-model="form.nd" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.sxrq')" prop="sxrq">
+              <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.cctj')" prop="cctj">
+              <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')" prop="ccwz">
+              <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.xgr')">
+              <el-input type="text" v-model="form.bjrMc" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.xgbz')" prop="bjbz">
+              <el-input type="text" v-model="form.bjbz" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
+                <el-option  label="同意编辑" :value="10" />
+                <el-option label="拒绝编辑" :value="1" />
+              </el-select>
+            </el-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-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 { shbj, info } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Shbj",
+  components: { SelectList },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        qmyy: [{
+          required: true,
+          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: ' ',
+          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,
+        bjrMc: null,
+        bjbz: null,
+        qmyy: '同意编辑',
+        remark: ''
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      info({ id: row.id }).then(response => {
+        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.bjbz = response.data.bjbz
+        this.form.bjrMc = response.data.bjrMc
+        this.open = true
+        this.$modal.closeLoading()
+      })
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          shbj(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
new file mode 100644
index 0000000..cb8b140
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
@@ -0,0 +1,167 @@
+G<template>
+  <div>
+    <!-- 审核修改库存弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.shxgkc')" :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.gyzj.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.gyzj.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.gyzj.kc')" prop="kcbj">
+              <el-input type="number" v-model="form.kcbj" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.kcdw')" prop="kcdwbj">
+              <el-input type="text" v-model="form.kcdwbj" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+         <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gyzj.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.gyzj.xgbz')" prop="kcbjbz">
+              <el-input type="text" v-model="form.kcbjbz" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+         <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
+                <el-option  label="同意修改库存" :value="10" />
+                <el-option  label="拒绝修改库存" :value="1" />
+              </el-select>
+            </el-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-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 { shxgkc, info } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Shxgkc",
+  components: { SelectList },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        kcbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kcdwbj: [{
+          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,
+        kcbj: null,
+        kcdwbj: null,
+        qmrmm: null,
+        kcbjrMc: null,
+        kcbjbz: null,
+        qmyy: '同意修改库存',
+        remark: ''
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      info({ id: row.id }).then(response => {
+        this.form.id = response.data.id
+        this.form.mc = response.data.mc
+        this.form.bh = response.data.bh
+        this.form.kcbj = response.data.kcbj
+        this.form.kcdwbj = response.data.kcdwbj
+        this.form.kcbjbz = response.data.kcbjbz
+        this.form.kcbjrMc = response.data.kcbjrMc
+        this.open = true
+        this.$modal.closeLoading()
+      })
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          shxgkc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
new file mode 100644
index 0000000..ed7f7bd
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
@@ -0,0 +1,145 @@
+G<template>
+  <div>
+    <!-- 修改库存弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.xgkc')" :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.gyzj.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.gyzj.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.gyzj.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.gyzj.kcdw')" prop="kcdwbj">
+              <el-input type="text" v-model="form.kcdw" maxlength="50" :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.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-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>
+          </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/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+
+export default {
+  name: "Xgkc",
+  components: { SelectList },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        kc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kcdw: [{
+          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,
+        kc: null,
+        kcdw: null,
+        qmrmm: null,
+        qmyy: '修改库存',
+        kcbjbz: ''
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      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 => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
new file mode 100644
index 0000000..42a304c
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -0,0 +1,221 @@
+G<template>
+  <!-- 详情 -->
+  <div v-show="open">
+    <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('page.business.study.cancel')}}</el-button>
+          <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
+        </div>
+      </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.gyzj.mc') }}</div>
+              <el-input type="text" :value="form.mc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.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.gyzj.nd') }}</div>
+              <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{
+                form.nddw }}</template>
+              </el-input>
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.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.gyzj.sxrq') }}</div>
+              <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.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.gyzj.ccwz') }}</div>
+              <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.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-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.gyzj.md') }}</div>
+              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.gyzj.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.gyzj.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"> 给药制剂台账</div>
+          </div>
+          <div class="pal">
+            <el-table :data="tzList" v-loading="loadingTz">
+              <el-table-column :label="$t('page.business.resource.gyzj.syr')" align="center" prop="qmrMc"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.lqghr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.ffjsr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.czlx')" align="center" prop="qmyy"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.ffjsr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  {{ scope.row.czl }}{{ scope.row.czldw }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.gyzj.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.ccsj')" align="center" prop="createTime"
+                width="150px" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalTz > 0" :total="totalTz" :page.sync="queryParamstZ.pageNum"
+              :limit.sync="queryParamstZ.pageSize" @pagination="getTzList" />
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> 稽查轨迹日志</div>
+          </div>
+          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { info, tzList, jcgjList } from "@/api/business/gyzj/gyzj"
+import JcgjList from "@/views/business/comps/common/JcgjList";
+
+export default {
+  name: "Xq",
+  components: { JcgjList },
+  data() {
+    return {
+      form: {},
+      tzList: [],
+      totalTz: 0,
+      loadingTz: true,
+      open: false,
+      queryParamstZ: {
+        gyzjId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjTotal: 0,
+      jcgjList: [],
+      queryJcgjParams: {
+        pageNum: 1,
+        gyzjId: null,
+        pageSize: 10,
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    exportExcel(){
+      alert('todo')
+    },
+    jcgjListHandleQuery(val) {
+      this.$modal.loading()
+      jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      })
+    },
+    getJjcgjList() {
+      jcgjList(this.queryJcgjParams).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      })
+    },
+    cancel() {
+      this.open = false
+      this.$emit('callback')
+    },
+    getTzList() {
+      this.loadingTz = true
+      tzList(this.queryParamstZ).then(response => {
+        this.tzList = response.rows
+        this.totalTz = response.total
+        this.loadingTz = false
+        this.getJjcgjList()
+      })
+    },
+    show(row) {
+      this.$modal.loading()
+      this.queryParamstZ.gyzjId = row.id
+      this.queryJcgjParams.gyzjId = row.id
+      info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getTzList()
+        this.open = true
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
new file mode 100644
index 0000000..962e91e
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
@@ -0,0 +1,216 @@
+G<template>
+  <div>
+    <!-- 钥匙发放弹窗 -->
+    <el-dialog :title="$t('page.business.resource.gyzj.ysff')" :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>
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <el-table :data="selectList" border>
+                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" />
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.ckl }}{{ scope.row.ckldw }}
+                  </template>
+                </el-table-column>
+
+                <el-table-column :label="$t('page.business.resource.gyzj.ffzytj')" align="center" prop="ffzytj"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" prop="ckmz" width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ckmzdw')" align="center" prop="ckmzdw"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ffr1')" align="center" prop="ffr1Mc"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ffr2')" align="center" prop="ffr2Mc"
+                  width="150px" />
+                <el-table-column :label="$t('form.remark')" align="center" prop="ffbz" width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" prop="ffxmMc"
+                  width="150px" />
+              </el-table>
+            </el-col>
+          </el-row>
+        </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.zcg')" prop="zcgId">
+              <el-input type="text" v-model="form.zcgId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" v-model="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="text" v-model="form.remark"  maxlength="20"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.lqr1')" prop="lqr1Id">
+              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="lqr1mm">
+              <el-input type="text" v-model="form.lqr1mm"  maxlength="20"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.lqr2')" prop="lqr2Id">
+              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="lqr2mm">
+              <el-input type="text" v-model="form.lqr2mm"  maxlength="20"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ffr')">
+              <el-input type="text" v-model="nickName" maxlength="50" 
+                :placeholder="$t('form.placeholderInput')" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="ffrmm">
+              <el-input type="text" v-model="form.ffrmm"  maxlength="20"
+                :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 { ysff } from "@/api/business/gyzj/gyzj"
+import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+
+export default {
+  name: "Ysff",
+  components: {SelectDeptUser},
+  data() {
+    return {
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zcgId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr2mm:[{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr1mm:[{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr1Id:[{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr2Id:[{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffrmm:[{
+          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 = {
+        ids: null,
+        qmyy: '钥匙发放',
+        zcgId: null,
+        qmrmm: null,
+        remark: null,
+        lqr1Id: null,
+        lqr2Id: null,
+        lqr1mm: null,
+        lqr2mm: null,
+        ffrId: null,
+        ffrmm: null,
+      }
+      this.resetForm("form")
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let params = this.form
+          params.list = this.selectList
+          ysff(params).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
new file mode 100644
index 0000000..3637027
--- /dev/null
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -0,0 +1,420 @@
+<template>
+  <div>
+    <!-- 列表 -->
+    <div>
+      <div class="app-container gyzj" 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.gyzj.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.gyzj.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.gyzj.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-select>
+          </el-form-item>
+          <!-- 制剂状态 -->
+          <el-form-item :label="$t('page.business.resource.gyzj.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" />
+              <el-option :label="$t('page.business.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.zjzt.djd')" :value="11" />
+            </el-select>
+          </el-form-item>
+          <!-- 失效日期 -->
+          <el-form-item :label="$t('page.business.resource.gyzj.sxrq') + '：'">
+            <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;" />
+          </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-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <!-- 批量发放 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlff"
+              v-hasPermi="['business:resource:gyzj:ff']">{{
+                $t('page.business.resource.gyzj.plff') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量处置药剂 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlczyj"
+              v-hasPermi="['business:resource:gyzj:czyj']">{{
+                $t('page.business.resource.gyzj.plczyj') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量处置容器 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlczrq"
+              v-hasPermi="['business:resource:gyzj:czrq']">{{
+                $t('page.business.resource.gyzj.plczrq') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 钥匙发放 -->
+            <el-button type="primary" :disabled="multiple" @click="handleYsff"
+              v-hasPermi="['business:resource:gyzj:ysff']">{{
+                $t('page.business.resource.gyzj.ysff') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量锁定 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd"
+              v-hasPermi="['business:resource:gyzj:sd']">{{
+                $t('page.business.resource.gyzj.plsd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量归档 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd"
+              v-hasPermi="['business:resource:gyzj:gd']">{{
+                $t('page.business.resource.gyzj.plgd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导出 -->
+            <el-button type="primary" :disabled="multiple" @click="handleDc"
+              v-hasPermi="['business:resource:gyzj:dc']">{{
+                $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.gyzj.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.nd')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.nd }}{{ scope.row.nddw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.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.gyzj.sxrq')" align="center" prop="sxrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc" width="130px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.cctj')" align="center" prop="cctj" width="130px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.ccwz')" align="center" prop="ccwz" width="130px" />
+
+          <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.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>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.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-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">
+                <!-- 详情 -->
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:gyzj:xq']">{{
+                  $t('page.business.resource.gyzj.detail') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 1">
+                <!-- 发放 -->
+                <el-button type="text" @click="handleFf(scope.row)" v-hasPermi="['business:resource:gyzj:ff']">{{
+                  $t('page.business.resource.gyzj.fafang') }}</el-button>
+                <!-- 处置药剂 -->
+                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:gyzj:czyj']">{{
+                  $t('page.business.resource.gyzj.czyj') }}</el-button>
+                <!-- 处置容器 -->
+                <el-button v-if="scope.row.rqzt == 1" type="text" @click="handleCzrq(scope.row)"
+                  v-hasPermi="['business:resource:gyzj:czrq']">{{
+                    $t('page.business.resource.gyzj.czrq') }}</el-button>
+                <!-- 编辑 -->
+                <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
+                  v-hasPermi="['business:resource:gyzj:bj']">{{
+                    $t('form.edit') }}</el-button>
+                <!-- 修改库存 -->
+                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:resource:gyzj:xgkc']">{{
+                    $t('page.business.resource.gyzj.xgkc') }}</el-button>
+                <!-- 锁定 -->
+                <el-button type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:gyzj:sd']">{{
+                  $t('page.business.resource.gyzj.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:gyzj:shbj']">{{
+                  $t('page.business.resource.gyzj.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:gyzj:shxgkc']">{{
+                  $t('page.business.resource.gyzj.shxgkc') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 5">
+                <!-- 解锁 -->
+                <el-button type="text" @click="handleJs(scope.row)" v-hasPermi="['business:resource:gyzj:js']">{{
+                  $t('page.business.resource.gyzj.unlock') }}</el-button>
+                <!-- 归档 -->
+                <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:gyzj:gd']">{{
+                  $t('page.business.resource.gyzj.guidang') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 3">
+                <!-- 归还 -->
+                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gyzj:gh']">{{
+                  $t('page.business.resource.gyzj.guihuan') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 9">
+                <!-- 解档 -->
+                <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gyzj:jd']">{{
+                  $t('page.business.resource.gyzj.jiedang') }}</el-button>
+                <!-- 借阅 -->
+                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gyzj:jy']">{{
+                  $t('page.business.resource.gyzj.jieyue') }}</el-button>
+              </template>
+            </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" />
+      <!-- 编辑 -->
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
+      <!-- 审核编辑 -->
+      <Shbj key="Shbj" ref="Shbj" @callback="handleQuery" />
+      <!-- 修改库存 -->
+      <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
+      <!-- 审核修改库存 -->
+      <Shxgkc key="Shxgkc" ref="Shxgkc" @callback="handleQuery" />
+      <!-- 借阅 -->
+      <Jy key="Jy" ref="Jy" @callback="handleQuery" />
+      <!-- 归还 -->
+      <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" />
+      <!-- 钥匙发放 -->
+      <Ysff key="Ysff" ref="Ysff" @callback="handleQuery" />
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { list } from "@/api/business/gyzj/gyzj"
+import Sd from "./gyzj/Sd";
+import Js from "./gyzj/Js";
+import Gd from "./gyzj/Gd";
+import Jd from "./gyzj/Jd";
+import Xq from "./gyzj/Xq";
+import Bj from "./gyzj/Bj";
+import Shbj from "./gyzj/Shbj";
+import Xgkc from "./gyzj/Xgkc";
+import Shxgkc from "./gyzj/Shxgkc";
+import Jy from "./gyzj/Jy";
+import Gh from "./gyzj/Gh";
+import Ff from "./gyzj/Ff";
+import Czrq from "./gyzj/Czrq";
+import Czyj from "./gyzj/Czyj";
+import Ysff from "./gyzj/Ysff";
+
+export default {
+  name: "GyzjList",
+  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
+  data() {
+    return {
+      daterange: [],
+      loading: true,
+      single: true,
+      multiple: true,
+      showDetail:false,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        jyzt: null,
+        zjzt: null,
+        bh: null,
+        startDate: null,
+        endDate: null,
+      },
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    //导出
+    handleDc() {
+
+    },
+    //钥匙发放
+    handleYsff() {
+      this.$refs.Ysff.showBatch(this.selectList)
+    },
+    //批量发放
+    handlePlff() {
+      this.$refs.Ff.showBatch(this.selectList)
+    },
+    //发放
+    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)
+    },
+    //批量处置药剂
+    handlePlczyj() {
+      this.$refs.Czyj.showBatch(this.selectList)
+    },
+    //编辑
+    handleBj(row) {
+      this.$refs.Bj.show(row)
+    },
+    //审核编辑
+    handleShbj(row) {
+      this.$refs.Shbj.show(row)
+    },
+    //修改库存
+    handleXgkc(row) {
+      this.$refs.Xgkc.show(row)
+    },
+    //审核修改库存
+    handleShxgkc(row) {
+      this.$refs.Shxgkc.show(row)
+    },
+    //借阅
+    handleJy(row) {
+      this.$refs.Jy.show(row)
+    },
+    //归还
+    handleGh(row) {
+      this.$refs.Gh.show(row)
+    },
+    //是否可勾选
+    checkSelectable(row) {
+      return true;
+    },
+    closeXq(){
+      this.showDetail=false
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail=true
+      this.$refs.Xq.show(row)
+    },
+    //批量解锁
+    handlePljs() {
+      this.$refs.Js.showBatch(this.selectList)
+    },
+    //解锁
+    handleJs(row) {
+      this.$refs.Js.show(row)
+    },
+    //批量归档
+    handlePlgd() {
+      this.$refs.Gd.showBatch(this.selectList)
+    },
+    //归档
+    handleGd(row) {
+      this.$refs.Gd.show(row)
+    },
+    //解档
+    handleJd(row) {
+      this.$refs.Jd.show(row)
+    },
+    //批量锁定
+    handlePlsd() {
+      this.$refs.Sd.showBatch(this.selectList)
+    },
+    //锁定
+    handleSd(row) {
+      this.$refs.Sd.show(row)
+    },
+    //获取列表
+    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');
+      } else {
+        this.queryParams.startDate = ''
+        this.queryParams.endDate = ''
+      }
+      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">
+.gyzj {}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/gyzj/index.vue b/src/views/business/resource/gyzj/index.vue
new file mode 100644
index 0000000..cd8975c
--- /dev/null
+++ b/src/views/business/resource/gyzj/index.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="gyzj">
+    <el-tabs v-model="activeName" type="border-card" >
+      <el-tab-pane :label="$t('page.business.resource.gyzj.gyzjgl')" name="gyzjList">
+        <gyzjList key="gyzjList"/>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('page.business.resource.gyzj.ffhsjl')" name="ffjlList">
+        <ffjlList  key="ffjlList"/>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import gyzjList from "./comps/gyzjList";
+import ffjlList from "./comps/ffjlList";
+
+export default {
+  name: "Gyzj",
+  components: { gyzjList, ffjlList },
+  data() {
+    return {
+      activeName: 'gyzjList'
+    }
+  },
+  created() {
+  },
+  methods: {
+
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.gyzj {
+  margin: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/resource/mjy/comps/ffjl/Gd.vue b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
index 755c382..ddd40d1 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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">
         <div :style="isBatch ? 'display:block' : 'display:none'">
@@ -14,7 +14,7 @@ G<template>
          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -22,7 +22,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jd.vue b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
index 721bf9b..69be597 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <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.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -13,7 +13,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jq.vue b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
index 287bca6..6949d9e 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 加签弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.jiaqian')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <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-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -13,7 +13,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Js.vue b/src/views/business/resource/mjy/comps/ffjl/Js.vue
index c12fac8..b7bbcb2 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Js.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Js.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.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.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -13,7 +13,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jy.vue b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
index 55ba82d..6594c04 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.jieyue')" :visible.sync="open" width="500px" 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="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -13,7 +13,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Sd.vue b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
index f873e23..9664b9b 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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">
         <div :style="isBatch ? 'display:block' : 'display:none'">
@@ -14,7 +14,7 @@ G<template>
          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -22,7 +22,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/SelectList.vue b/src/views/business/resource/mjy/comps/ffjl/SelectList.vue
index bb70f98..8896bbd 100644
--- a/src/views/business/resource/mjy/comps/ffjl/SelectList.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/SelectList.vue
@@ -1,24 +1,24 @@
 G<template>
   <div class="app-container">
     <el-table :data="selectList" border>
-       <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+       <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.zykgl.mjy.bh')" align="center" prop="bh"
+        <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.zykgl.mjy.jlzt')" align="center" width="100px" fixed="right">
+           <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.zykgl.jlzt.wsd') }}</span>
-            <span v-if="scope.row.jlzt == 3">{{ $t('page.business.zykgl.jlzt.ysd') }}</span>
-            <span v-if="scope.row.jlzt == 5">{{ $t('page.business.zykgl.jlzt.dgd') }}</span>
-            <span v-if="scope.row.jlzt == 7">{{ $t('page.business.zykgl.jlzt.gd') }}</span>
-            <span v-if="scope.row.jlzt == 9">{{ $t('page.business.zykgl.jlzt.djd') }}</span>
+            <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.zykgl.mjy.jyzt')" align="center" width="100px"  fixed="right">
+        <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.zykgl.jyzt.wjy') }}</span>
-            <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-            <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+            <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>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index 88f284a..eb665f2 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -7,137 +7,138 @@
         <div class="left-title"></div>
       </div>
       <div class="right-top">
+        <el-button @click="cancel()">{{ $t('page.business.study.cancel') }}</el-button>
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </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.zykgl.mjy.mc') }}</div>
-              <el-input type="text" :value="form.mc" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.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.zykgl.mjy.jlzt') }}</div>
-              <el-select v-model="form.jlzt" disabled style="width: 100%;">
-                <el-option :label="$t('page.business.zykgl.jlzt.wsd')" :value="1" />
-                <el-option :label="$t('page.business.zykgl.jlzt.ysd')" :value="3" />
-                <el-option :label="$t('page.business.zykgl.jlzt.dgd')" :value="5" />
-                <el-option :label="$t('page.business.zykgl.jlzt.gd')" :value="7" />
-                <el-option :label="$t('page.business.zykgl.jlzt.djd')" :value="9" />
-              </el-select>
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.jyzt') }}</div>
-              <el-select v-model="form.jyzt" disabled style="width: 100%;">
-                <el-option :label="$t('page.business.zykgl.jyzt.wjy')" :value="1" />
-                <el-option :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
-                <el-option :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
-              </el-select>
-            </div>
-          </div>
-          <div class="pal">
-            <div class="left">
-              <div class="left-title">{{ $t('page.business.zykgl.mjy.zcg') }}</div>
-              <el-input type="text" :value="form.zcgMc" maxlength="50" disabled />
-            </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.zykgl.mjy.md') }}</div>
-              <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.zytj') }}</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.zykgl.mjy.cksj') }}</div>
-              <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.ckjz') }}</div>
-              <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                  }}</template>
-              </el-input>
-            </div>
-          </div>
-          <div class="pal">
-            <div class="left">
-              <div class="left-title">{{ $t('page.business.zykgl.mjy.lqr1') }}</div>
-              <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.lqr2') }}</div>
-              <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
-            </div>
-          </div>
-          <div class="pal">
-            <div class="left">
-              <div class="left-title">{{ $t('page.business.zykgl.mjy.kgy1') }}</div>
-              <el-input type="text" :value="form.kgy1Mc" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.kgy2') }}</div>
-              <el-input type="text" :value="form.kgy2Mc" maxlength="50" disabled />
-            </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.zykgl.mjy.rksj') }}</div>
-              <el-input type="text" :value="form.ghrq" maxlength="50" disabled />
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.rkjz') }}</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.zykgl.mjy.syl') }}</div>
-              <el-input type="text" :value="form.syl" maxlength="50" disabled> <template slot="append">{{ form.syldw
-                  }}</template>
-              </el-input>
-            </div>
-            <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.zytj') }}</div>
-              <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
-            </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.mjy.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>
+            <el-input type="text" :value="form.bh" maxlength="50" disabled />
           </div>
         </div>
-        <div class="content-right">
-          <div class="content-title">
-            <div class="line"></div>
-            <div class="subtitle"> 稽查轨迹日志</div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.mjy.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-select>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.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-select>
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.mjy.zcg') }}</div>
+            <el-input type="text" :value="form.zcgMc" maxlength="50" disabled />
+          </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.mdMc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.zytj') }}</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.cksj') }}</div>
+            <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.ckjz') }}</div>
+            <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
+            }}</template>
+            </el-input>
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.mjy.lqr1') }}</div>
+            <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.lqr2') }}</div>
+            <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.mjy.kgy1') }}</div>
+            <el-input type="text" :value="form.kgy1Mc" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.kgy2') }}</div>
+            <el-input type="text" :value="form.kgy2Mc" maxlength="50" disabled />
+          </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.rksj') }}</div>
+            <el-input type="text" :value="form.ghrq" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.rkjz') }}</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.syl') }}</div>
+            <el-input type="text" :value="form.syl" maxlength="50" disabled> <template slot="append">{{ form.syldw
+            }}</template>
+            </el-input>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.zytj') }}</div>
+            <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
           </div>
-          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
-
-          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-            @pagination="getJjcgjList" />
         </div>
       </div>
+      <div class="content-right">
+        <div class="content-title">
+          <div class="line"></div>
+          <div class="subtitle"> 稽查轨迹日志</div>
+        </div>
+        <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+
+        <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+          @pagination="getJjcgjList" />
+      </div>
+    </div>
   </div>
 </template>
 
@@ -164,7 +165,7 @@ export default {
   created() {
   },
   methods: {
-    exportExcel(){
+    exportExcel() {
       alert('todo')
     },
     cancel() {
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index c5b8cc5..0d4aa45 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -7,38 +7,38 @@
           <el-row>
             <el-col :span="24">
               <!-- 名称 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.mc') + '：'">
                 <el-input v-model="queryParams.mc" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 编号 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.bh') + '：'">
                 <el-input v-model="queryParams.bh" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 目的 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.md') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.md') + '：'">
                 <el-input v-model="queryParams.mdId" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.jlzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.jlzt') + '：'">
                 <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
-                  <el-option :label="$t('page.business.zykgl.jlzt.wsd')" :value="1" />
-                  <el-option :label="$t('page.business.zykgl.jlzt.ysd')" :value="3" />
-                  <el-option :label="$t('page.business.zykgl.jlzt.dgd')" :value="5" />
-                  <el-option :label="$t('page.business.zykgl.jlzt.gd')" :value="7" />
-                  <el-option :label="$t('page.business.zykgl.jlzt.djd')" :value="9" />
+                  <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-select>
               </el-form-item>
               <!-- 借阅状态 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.jyzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'">
                 <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
-                  <el-option :label="$t('page.business.zykgl.jyzt.wjy')" :value="1" />
-                  <el-option :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
-                  <el-option :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
+                  <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-select>
               </el-form-item>
               <el-form-item>
@@ -50,13 +50,13 @@
           <el-row>
             <el-col :span="24">
               <!-- 出库日期 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.cksj') + '：'">
+              <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')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
               </el-form-item>
               <!-- 入库日期 -->
-              <el-form-item :label="$t('page.business.zykgl.mjy.rksj') + '：'">
+              <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;" />
@@ -69,13 +69,13 @@
             <!-- 批量归档 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlgd"
               v-hasPermi="['business:resource:mjy:ffjlgd']">{{
-                $t('page.business.zykgl.mjy.plgd') }}</el-button>
+                $t('page.business.resource.mjy.plgd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlsd"
               v-hasPermi="['business:resource:mjy:ffjlsd']">{{
-                $t('page.business.zykgl.mjy.plsd') }}</el-button>
+                $t('page.business.resource.mjy.plsd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
@@ -87,55 +87,55 @@
 
         <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.zykgl.mjy.mc')" align="left" prop="mc"
+          <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.zykgl.mjy.bh')" align="center" prop="bh"
+          <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.zykgl.mjy.md')" align="center" prop="mdMc"
+          <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="mdMc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.zytj')" align="center" prop="ffzytj"
+          <el-table-column :label="$t('page.business.resource.mjy.zytj')" align="center" prop="ffzytj"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.cksj')" align="center" prop="ffrq" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.rksj')" align="center" prop="ghrq" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.ckjz')" align="center" width="150px">
+          <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.ckjz')" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.ckl }} {{ scope.row.ckldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.rkjz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.mjy.rkjz')" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.rkl }} {{ scope.row.rkldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.syl')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.mjy.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.zykgl.mjy.lqr1')" align="center" prop="lqr1Mc"
+          <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.lqr2')" align="center" prop="lqr2Mc"
+          <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.kgy1')" align="center" prop="kgy1Mc"
+          <el-table-column :label="$t('page.business.resource.mjy.kgy1')" align="center" prop="kgy1Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.kgy2')" align="center" prop="kgy2Mc"
+          <el-table-column :label="$t('page.business.resource.mjy.kgy2')" align="center" prop="kgy2Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.zcg')" align="center" prop="zcgMc"
+          <el-table-column :label="$t('page.business.resource.mjy.zcg')" align="center" prop="zcgMc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.jlzt')" align="center" width="100px" fixed="right">
+          <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.zykgl.jlzt.wsd') }}</span>
-              <span v-if="scope.row.jlzt == 3">{{ $t('page.business.zykgl.jlzt.ysd') }}</span>
-              <span v-if="scope.row.jlzt == 5">{{ $t('page.business.zykgl.jlzt.dgd') }}</span>
-              <span v-if="scope.row.jlzt == 7">{{ $t('page.business.zykgl.jlzt.gd') }}</span>
-              <span v-if="scope.row.jlzt == 9">{{ $t('page.business.zykgl.jlzt.djd') }}</span>
+              <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.zykgl.mjy.jyzt')" align="center" width="100px" fixed="right">
+          <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.zykgl.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+              <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-column :label="$t('form.operate')" fixed="right" align="center"
@@ -144,31 +144,31 @@
                <!-- 加签 -->
               <el-button v-if="scope.row.jlzt == 1 " type="text"
                 @click="handleJq(scope.row)" v-hasPermi="['business:resource:mjy:ffjljq']">{{
-                  $t('page.business.zykgl.mjy.jiaqian') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.detail') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.lock') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.unlock') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.guidang') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.jiedang') }}</el-button>
+                  $t('page.business.resource.mjy.jiedang') }}</el-button>
               <!-- 借阅 -->
               <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:mjy:ffjljy']">{{
-                  $t('page.business.zykgl.mjy.jieyue') }}</el-button>
+                  $t('page.business.resource.mjy.jieyue') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/business/resource/mjy/comps/mjy/Bj.vue b/src/views/business/resource/mjy/comps/mjy/Bj.vue
index 285c36a..dcc33f7 100644
--- a/src/views/business/resource/mjy/comps/mjy/Bj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Bj.vue
@@ -5,12 +5,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.zykgl.mjy.mc')" prop="mc">
+            <el-form-item :label="$t('page.business.resource.mjy.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.zykgl.mjy.bh')" prop="glyj">
+            <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>
@@ -18,31 +18,31 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.nd')" prop="nd">
+            <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>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.nddw')" prop="nddw">
+            <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-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.sxrq')" prop="sxrq">
+            <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>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.cctj')" prop="cctj">
+            <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>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwz">
+            <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-form-item>
           </el-col>
diff --git a/src/views/business/resource/mjy/comps/mjy/Czrq.vue b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
index c2ad4f1..eda393e 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
@@ -1,24 +1,24 @@
 G<template>
   <div>
     <!-- 处置容器弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.czrq')" :visible.sync="open" width="1200px" append-to-body
+    <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.zykgl.mjy.mc')" align="left" prop="mc"
+                <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.zykgl.mjy.bh')" align="left" prop="bh"
+                <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.zykgl.mjy.czfs')" align="center" width="250px">
+                <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.zykgl.mjy.yuanyin')" align="center">
+                <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')" />
@@ -37,26 +37,26 @@ G<template>
         <div v-if="!isBatch">
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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.zykgl.mjy.bh')" prop="glyj">
+              <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.zykgl.mjy.czfs')" prop="czfs">
+              <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.zykgl.mjy.yuanyin')" prop="czyy">
+              <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>
@@ -67,7 +67,7 @@ G<template>
         </div>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.clr')">
+            <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>
@@ -80,8 +80,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.fhr')" prop="fhrId">
-              <el-input type="text" v-model="form.fhrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.fhr')" prop="fhrId">
+              <SelectDeptUser  v-model="form.fhrId" key="jdrId"/>
             </el-form-item>
           </el-col>
 
@@ -93,8 +93,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.jdr')" prop="jdrId">
-              <el-input type="text" v-model="form.jdrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <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">
@@ -122,9 +122,11 @@ G<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,
diff --git a/src/views/business/resource/mjy/comps/mjy/Czyj.vue b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
index 3a5ee95..9a8ad54 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
@@ -1,30 +1,30 @@
 G<template>
   <div>
     <!-- 处置药剂弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.czyj')" :visible.sync="open" width="1200px" append-to-body
+    <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.zykgl.mjy.mc')" align="left" prop="mc"
+                <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.zykgl.mjy.bh')" align="left" prop="bh"
+                <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.zykgl.mjy.czfs')" align="center" width="250px">
+                <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.zykgl.mjy.yuanyin')" align="center">
+                <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.zykgl.mjy.czl')" align="center">
+                <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>
@@ -44,24 +44,24 @@ G<template>
         <div v-if="!isBatch">
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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.zykgl.mjy.bh')" prop="glyj">
+              <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.zykgl.mjy.czfs')" prop="czfs">
+              <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.zykgl.mjy.czl')" prop="czl">
+              <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>
@@ -69,7 +69,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.yuanyin')" prop="czyy">
+              <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>
@@ -80,7 +80,7 @@ G<template>
         </div>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.clr')">
+            <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>
@@ -93,8 +93,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.fhr')" prop="fhrId">
-              <el-input type="text" v-model="form.fhrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.fhr')" prop="fhrId">
+              <SelectDeptUser  v-model="form.fhrId" key="fhrId"/>
             </el-form-item>
           </el-col>
 
@@ -106,8 +106,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.jdr')" prop="jdrId">
-              <el-input type="text" v-model="form.jdrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <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">
@@ -135,9 +135,11 @@ G<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,
diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue
index 0a90bd4..c3fc32a 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue
@@ -1,31 +1,31 @@
 G<template>
   <div>
     <!-- 发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.fafang')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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.zykgl.mjy.mc')" align="left" prop="mc"
+                <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.zykgl.mjy.bh')" align="left" prop="bh"
+                <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.zykgl.mjy.zytj')" align="center" width="250px">
+                <el-table-column :label="$t('page.business.resource.mjy.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.zykgl.mjy.ckmz')" align="center" width="250px">
+                <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.zykgl.mjy.md')" align="center" width="250px">
+                <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"
                       :placeholder="$t('form.placeholderInput')" />
@@ -50,7 +50,7 @@ G<template>
         <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -58,7 +58,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
@@ -66,12 +66,12 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.zykgl.mjy.zytj')" prop="zytj">
+              <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-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.zykgl.mjy.ckmz')" prop="ckmz">
+              <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-input>
@@ -80,7 +80,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.md')" prop="xmId">
+              <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>
             </el-col>
@@ -98,8 +98,8 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.lqr1')" prop="lqr1Id">
-              <el-input type="text" v-model="form.lqr1Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.lqr1')" prop="lqr1Id">
+              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -111,8 +111,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.lqr2')" prop="lqr2Id">
-              <el-input type="text" v-model="form.lqr2Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.lqr2')" prop="lqr2Id">
+              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -124,8 +124,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.ffr1')" prop="ffr1Id">
-              <el-input type="text" v-model="form.ffr1Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.ffr1')" prop="ffr1Id">
+              <SelectDeptUser  v-model="form.ffr1Id" key="ffr1Id"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -137,8 +137,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.ffr2')" prop="ffr2Id">
-              <el-input type="text" v-model="form.ffr2Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.ffr2')" prop="ffr2Id">
+              <SelectDeptUser  v-model="form.ffr2Id" key="ffr2Id"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -169,10 +169,11 @@ G<template>
 import { ff, plff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Ff",
-  components: { SelectList },
+  components: { SelectList,SelectDeptUser },
   data() {
     return {
       isBatch: false,
diff --git a/src/views/business/resource/mjy/comps/mjy/Gd.vue b/src/views/business/resource/mjy/comps/mjy/Gd.vue
index d753522..6b568f8 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div>
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
@@ -14,7 +14,7 @@ G<template>
          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -22,7 +22,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index 3ada4f8..7e513bb 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -1,12 +1,12 @@
 G<template>
   <div>
     <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -14,7 +14,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Jd.vue b/src/views/business/resource/mjy/comps/mjy/Jd.vue
index 45e79e5..fef58ef 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jd.vue
@@ -1,10 +1,10 @@
 G<template>
   <div >
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <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">
            <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+           <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">
@@ -15,7 +15,7 @@ G<template>
          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -23,7 +23,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Js.vue b/src/views/business/resource/mjy/comps/mjy/Js.vue
index 583fddd..1d6e4f5 100644
--- a/src/views/business/resource/mjy/comps/mjy/Js.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Js.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.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.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -13,7 +13,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Jy.vue b/src/views/business/resource/mjy/comps/mjy/Jy.vue
index ec8367b..508571d 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jy.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jy.vue
@@ -1,10 +1,10 @@
 G<template>
   <div >
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.jieyue')" :visible.sync="open" width="500px" 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">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+           <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">
@@ -15,7 +15,7 @@ G<template>
           <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -23,7 +23,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Sd.vue b/src/views/business/resource/mjy/comps/mjy/Sd.vue
index 4aa8ece..d11d974 100644
--- a/src/views/business/resource/mjy/comps/mjy/Sd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Sd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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">
         <div :style="isBatch ? 'display:block' : 'display:none'">
@@ -14,7 +14,7 @@ G<template>
         <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -22,7 +22,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/SelectList.vue b/src/views/business/resource/mjy/comps/mjy/SelectList.vue
index a5865d2..79e5d2f 100644
--- a/src/views/business/resource/mjy/comps/mjy/SelectList.vue
+++ b/src/views/business/resource/mjy/comps/mjy/SelectList.vue
@@ -1,23 +1,23 @@
 G<template>
   <div class="app-container">
     <el-table :data="selectList" border>
-      <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
-       <el-table-column :label="$t('page.business.zykgl.mjy.zjzt')" align="center">
+      <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="left" prop="bh" :show-overflow-tooltip="true" />
+       <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.zykgl.zjzt.rk') }}</span>
-              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
-              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.zykgl.zjzt.ysd') }}</span>
-              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.zykgl.zjzt.dgd') }}</span>
-              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.zykgl.zjzt.gd') }}</span>
-              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
+              <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>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" >
+          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" >
             <template slot-scope="scope">
-              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+              <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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Shbj.vue b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
index 2b76e55..7c41e2f 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shbj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
@@ -1,60 +1,60 @@
 G<template>
   <div>
     <!-- 审核编辑弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.shbj')" :visible.sync="open" width="800px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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.zykgl.mjy.mc')" prop="mc">
+            <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.zykgl.mjy.bh')" prop="glyj">
+            <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.zykgl.mjy.nd')" prop="nd">
+            <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>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.nddw')" prop="nddw">
+            <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.zykgl.mjy.sxrq')" prop="sxrq">
+            <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>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.cctj')" prop="cctj">
+            <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>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwz">
+            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
               <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.zykgl.mjy.xgr')">
+            <el-form-item :label="$t('page.business.resource.mjy.xgr')">
               <el-input type="text" v-model="form.bjrMc" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.zykgl.mjy.xgbz')" prop="bjbz">
+            <el-form-item :label="$t('page.business.resource.mjy.xgbz')" prop="bjbz">
               <el-input type="text" v-model="form.bjbz" disabled />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
index efe3019..677fbcc 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
@@ -1,40 +1,40 @@
 G<template>
   <div>
     <!-- 审核修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.shxgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.shxgkc')" :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.zykgl.mjy.mc')" prop="mcbj">
+            <el-form-item :label="$t('page.business.resource.mjy.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.zykgl.mjy.bh')" prop="glyj">
+            <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.zykgl.mjy.kc')" prop="kcbj">
+            <el-form-item :label="$t('page.business.resource.mjy.kc')" prop="kcbj">
               <el-input type="number" v-model="form.kcbj" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.kcdw')" prop="kcdwbj">
+            <el-form-item :label="$t('page.business.resource.mjy.kcdw')" prop="kcdwbj">
               <el-input type="text" v-model="form.kcdwbj" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
          <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.zykgl.mjy.xgr')">
+            <el-form-item :label="$t('page.business.resource.mjy.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.zykgl.mjy.xgbz')" prop="kcbjbz">
+            <el-form-item :label="$t('page.business.resource.mjy.xgbz')" prop="kcbjbz">
               <el-input type="text" v-model="form.kcbjbz" disabled />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
index da23a1b..e466414 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
@@ -1,28 +1,28 @@
 G<template>
   <div>
     <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.xgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.xgkc')" :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.zykgl.mjy.mc')" prop="mcbj">
+            <el-form-item :label="$t('page.business.resource.mjy.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.zykgl.mjy.bh')" prop="glyj">
+            <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.zykgl.mjy.kc')" prop="kcbj">
+            <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.zykgl.mjy.kcdw')" prop="kcdwbj">
+            <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-form-item>
           </el-col>
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index 1a20e37..43541e7 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -8,6 +8,7 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
+        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
@@ -19,51 +20,51 @@ G<template>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.zykgl.mjy.mc') }}</div>
+              <div class="left-title">{{ $t('page.business.resource.mjy.mc') }}</div>
               <el-input type="text" :value="form.mc" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.bh') }}</div>
+              <div class="right-title">{{ $t('page.business.resource.mjy.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.zykgl.mjy.nd') }}</div>
+              <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>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.kcl') }}</div>
+              <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>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.zykgl.mjy.sxrq') }}</div>
+              <div class="left-title">{{ $t('page.business.resource.mjy.sxrq') }}</div>
               <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.cctj') }}</div>
+              <div class="right-title">{{ $t('page.business.resource.mjy.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.zykgl.mjy.ccwz') }}</div>
+              <div class="left-title">{{ $t('page.business.resource.mjy.ccwz') }}</div>
               <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
             </div>
             <div class="right">
-              <div class="right-title">{{ $t('page.business.zykgl.mjy.zjzt') }}</div>
+              <div class="right-title">{{ $t('page.business.resource.mjy.zjzt') }}</div>
               <el-select v-model="form.zjzt" disabled style="width: 100%;">
-                <el-option key="1" :label="$t('page.business.zykgl.zjzt.rk')" :value="1" />
-                <el-option key="3" :label="$t('page.business.zykgl.zjzt.yff')" :value="3" />
-                <el-option key="5" :label="$t('page.business.zykgl.zjzt.ysd')" :value="5" />
-                <el-option key="7" :label="$t('page.business.zykgl.zjzt.dgd')" :value="7" />
-                <el-option key="9" :label="$t('page.business.zykgl.zjzt.gd')" :value="9" />
-                <el-option key="11" :label="$t('page.business.zykgl.zjzt.djd')" :value="11" />
+                <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-select>
             </div>
           </div>
@@ -73,17 +74,17 @@ G<template>
           </div>
           <div class="pal">
             <div class="left">
-              <div class="left-title">{{ $t('page.business.zykgl.mjy.md') }}</div>
+              <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.zykgl.mjy.ssbd') }}</div>
+              <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.zykgl.mjy.bdssr') }}</div>
+              <div class="left-title">{{ $t('page.business.resource.mjy.bdssr') }}</div>
               <el-input type="text" :value="form.bdssrMc" maxlength="50" disabled />
             </div>
           </div>
@@ -93,31 +94,31 @@ G<template>
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
-              <el-table-column :label="$t('page.business.zykgl.mjy.syr')" align="center" prop="qmrMc"
+              <el-table-column :label="$t('page.business.resource.mjy.syr')" align="center" prop="qmrMc"
                 :show-overflow-tooltip="true" />
-              <el-table-column :label="$t('page.business.zykgl.mjy.lqghr')" align="center"
+              <el-table-column :label="$t('page.business.resource.mjy.lqghr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.zykgl.mjy.ffjsr')" align="center"
+              <el-table-column :label="$t('page.business.resource.mjy.ffjsr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.zykgl.mjy.czlx')" align="center" prop="qmyy"
+              <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center" prop="qmyy"
                 :show-overflow-tooltip="true" />
-              <el-table-column :label="$t('page.business.zykgl.mjy.ffjsr')" align="center"
+              <el-table-column :label="$t('page.business.resource.mjy.ffjsr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.czl }}{{ scope.row.czldw }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.zykgl.mjy.bzyy')" align="center" prop="remark"
+              <el-table-column :label="$t('page.business.resource.mjy.bzyy')" align="center" prop="remark"
                 :show-overflow-tooltip="true" />
-              <el-table-column :label="$t('page.business.zykgl.mjy.ccsj')" align="center" prop="createTime"
+              <el-table-column :label="$t('page.business.resource.mjy.ccsj')" align="center" prop="createTime"
                 width="150px" />
             </el-table>
           </div>
diff --git a/src/views/business/resource/mjy/comps/mjy/Ysff.vue b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
index df61704..7870fea 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
@@ -1,38 +1,38 @@
 G<template>
   <div>
     <!-- 钥匙发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.ysff')" :visible.sync="open" width="1200px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.ysff')" :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>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+                <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.zykgl.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.ckl')" align="center">
+                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.ckl }}{{ scope.row.ckldw }}
                   </template>
                 </el-table-column>
 
-                <el-table-column :label="$t('page.business.zykgl.mjy.ffzytj')" align="center" prop="ffzytj"
+                <el-table-column :label="$t('page.business.resource.mjy.ffzytj')" align="center" prop="ffzytj"
                   width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.ckmz')" align="center" prop="ckmz" width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.ckmzdw')" align="center" prop="ckmzdw"
+                <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" prop="ckmz" width="150px" />
+                <el-table-column :label="$t('page.business.resource.mjy.ckmzdw')" align="center" prop="ckmzdw"
                   width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.lqr1')" align="center" prop="lqr1Mc"
+                <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
                   width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.lqr2')" align="center" prop="lqr2Mc"
+                <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
                   width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.ffr1')" align="center" prop="ffr1Mc"
+                <el-table-column :label="$t('page.business.resource.mjy.ffr1')" align="center" prop="ffr1Mc"
                   width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.ffr2')" align="center" prop="ffr2Mc"
+                <el-table-column :label="$t('page.business.resource.mjy.ffr2')" align="center" prop="ffr2Mc"
                   width="150px" />
                 <el-table-column :label="$t('form.remark')" align="center" prop="ffbz" width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.md')" align="center" prop="ffxmMc"
+                <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="ffxmMc"
                   width="150px" />
               </el-table>
             </el-col>
@@ -40,7 +40,7 @@ G<template>
         </div>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.zcg')" prop="zcgId">
+            <el-form-item :label="$t('page.business.resource.mjy.zcg')" prop="zcgId">
               <el-input type="text" v-model="form.zcgId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -62,9 +62,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.lqr1')" prop="lqr1Id">
-              <el-input type="text" v-model="form.lqr1Id" maxlength="50" 
-                :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.lqr1')" prop="lqr1Id">
+              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -77,9 +76,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.lqr2')" prop="lqr2Id">
-              <el-input type="text" v-model="form.lqr2Id" maxlength="50" 
-                :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.lqr2')" prop="lqr2Id">
+              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -92,7 +90,7 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.ffr')">
+            <el-form-item :label="$t('page.business.resource.mjy.ffr')">
               <el-input type="text" v-model="nickName" maxlength="50" 
                 :placeholder="$t('form.placeholderInput')" disabled/>
             </el-form-item>
@@ -117,10 +115,11 @@ G<template>
 <script>
 import { ysff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Ysff",
-  components: {},
+  components: {SelectDeptUser},
   data() {
     return {
       ids: [],
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index 6ad87a8..595e998 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -5,38 +5,38 @@
       <div class="app-container 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.zykgl.mjy.mc') + '：'">
+          <el-form-item :label="$t('page.business.resource.mjy.mc') + '：'">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.bh') + '：'">
+          <el-form-item :label="$t('page.business.resource.mjy.bh') + '：'">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 借阅状态 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.jyzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option :label="$t('page.business.zykgl.jyzt.wjy')" :value="1" />
-              <el-option :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
-              <el-option :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
+              <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-select>
           </el-form-item>
           <!-- 制剂状态 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.zjzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.mjy.zjzt') + '：'">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option :label="$t('page.business.zykgl.zjzt.rk')" :value="1" />
-              <el-option :label="$t('page.business.zykgl.zjzt.yff')" :value="3" />
-              <el-option :label="$t('page.business.zykgl.zjzt.ysd')" :value="5" />
-              <el-option :label="$t('page.business.zykgl.zjzt.dgd')" :value="7" />
-              <el-option :label="$t('page.business.zykgl.zjzt.gd')" :value="9" />
-              <el-option :label="$t('page.business.zykgl.zjzt.djd')" :value="11" />
+              <el-option :label="$t('page.business.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.zjzt.djd')" :value="11" />
             </el-select>
           </el-form-item>
           <!-- 失效日期 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.sxrq') + '：'">
+          <el-form-item :label="$t('page.business.resource.mjy.sxrq') + '：'">
             <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;" />
@@ -52,37 +52,37 @@
             <!-- 批量发放 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlff"
               v-hasPermi="['business:resource:mjy:ff']">{{
-                $t('page.business.zykgl.mjy.plff') }}</el-button>
+                $t('page.business.resource.mjy.plff') }}</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.zykgl.mjy.plczyj') }}</el-button>
+                $t('page.business.resource.mjy.plczyj') }}</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.zykgl.mjy.plczrq') }}</el-button>
+                $t('page.business.resource.mjy.plczrq') }}</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.zykgl.mjy.ysff') }}</el-button>
+                $t('page.business.resource.mjy.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.zykgl.mjy.plsd') }}</el-button>
+                $t('page.business.resource.mjy.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.zykgl.mjy.plgd') }}</el-button>
+                $t('page.business.resource.mjy.plgd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
@@ -94,40 +94,40 @@
 
         <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.zykgl.mjy.mc')" align="left" prop="mc"
+          <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.zykgl.mjy.bh')" align="center" prop="bh"
+          <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.zykgl.mjy.nd')" align="center">
+          <el-table-column :label="$t('page.business.resource.mjy.nd')" align="center">
             <template slot-scope="scope">
               {{ scope.row.nd }}{{ scope.row.nddw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.kcl')" align="center">
+          <el-table-column :label="$t('page.business.resource.mjy.kcl')" align="center">
             <template slot-scope="scope">
               {{ scope.row.kc }}{{ scope.row.kcdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.zcg')" align="center" prop="zcgMc" width="130px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.cctj')" align="center" prop="cctj" width="130px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
+          <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.zykgl.mjy.zjzt')" align="center" width="100px" fixed="right">
+          <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.zykgl.zjzt.rk') }}</span>
-              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
-              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.zykgl.zjzt.ysd') }}</span>
-              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.zykgl.zjzt.dgd') }}</span>
-              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.zykgl.zjzt.gd') }}</span>
-              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
+              <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>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="100px" fixed="right">
+          <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.zykgl.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+              <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-column :label="$t('form.operate')" fixed="right" align="center"
@@ -136,19 +136,19 @@
               <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
                 <!-- 详情 -->
                 <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:xq']">{{
-                  $t('page.business.zykgl.mjy.detail') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.fafang') }}</el-button>
+                  $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.zykgl.mjy.czyj') }}</el-button>
+                  $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.zykgl.mjy.czrq') }}</el-button>
+                    $t('page.business.resource.mjy.czrq') }}</el-button>
                 <!-- 编辑 -->
                 <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
                   v-hasPermi="['business:resource:mjy:bj']">{{
@@ -156,41 +156,41 @@
                 <!-- 修改库存 -->
                 <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
                   v-hasPermi="['business:resource:mjy:xgkc']">{{
-                    $t('page.business.zykgl.mjy.xgkc') }}</el-button>
+                    $t('page.business.resource.mjy.xgkc') }}</el-button>
                 <!-- 锁定 -->
                 <el-button type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:mjy:sd']">{{
-                  $t('page.business.zykgl.mjy.lock') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.shbj') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.shxgkc') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.unlock') }}</el-button>
+                  $t('page.business.resource.mjy.unlock') }}</el-button>
                 <!-- 归档 -->
                 <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:mjy:gd']">{{
-                  $t('page.business.zykgl.mjy.guidang') }}</el-button>
+                  $t('page.business.resource.mjy.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.zykgl.mjy.guihuan') }}</el-button>
+                  $t('page.business.resource.mjy.guihuan') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 9">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
-                  $t('page.business.zykgl.mjy.jiedang') }}</el-button>
+                  $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.zykgl.mjy.jieyue') }}</el-button>
+                  $t('page.business.resource.mjy.jieyue') }}</el-button>
               </template>
             </template>
           </el-table-column>
diff --git a/src/views/business/resource/mjy/index.vue b/src/views/business/resource/mjy/index.vue
index d36dff5..819e57f 100644
--- a/src/views/business/resource/mjy/index.vue
+++ b/src/views/business/resource/mjy/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="mjy">
     <el-tabs v-model="activeName" type="border-card" >
-      <el-tab-pane label="麻精药管理" name="mjyList">
+      <el-tab-pane :label="$t('page.business.resource.mjy.mjygl')" name="mjyList">
         <mjyList key="mjyList"/>
       </el-tab-pane>
-      <el-tab-pane label="发放回收记录" name="ffjlList">
+      <el-tab-pane :label="$t('page.business.resource.mjy.ffhsjl')" name="ffjlList">
         <ffjlList  key="ffjlList"/>
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue
index 46c8d6a..83bbc83 100644
--- a/src/views/business/resource/sj/comps/Bj.vue
+++ b/src/views/business/resource/sj/comps/Bj.vue
@@ -4,7 +4,7 @@ G<template>
     <el-dialog :title="$t('form.edit')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+           <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">
@@ -15,7 +15,7 @@ G<template>
         <template v-else>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -23,7 +23,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/sj/comps/Cz.vue b/src/views/business/resource/sj/comps/Cz.vue
index cec3453..198b2c1 100644
--- a/src/views/business/resource/sj/comps/Cz.vue
+++ b/src/views/business/resource/sj/comps/Cz.vue
@@ -1,13 +1,13 @@
 G<template>
   <div>
     <!-- 批量处置试剂弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.cz')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.sj.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.zykgl.sj.mc')" prop="mc">
+              <el-form-item :label="$t('page.business.resource.sj.mc')" prop="mc">
                 <el-input type="text" v-model="form.mc" maxlength="50" disabled
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
@@ -15,7 +15,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.sj.bh')" prop="glyj">
+              <el-form-item :label="$t('page.business.resource.sj.bh')" prop="glyj">
                 <el-input type="text" v-model="form.bh" maxlength="50" disabled
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
@@ -23,14 +23,14 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.sj.sjczfs')" prop="czfs">
+              <el-form-item :label="$t('page.business.resource.sj.sjczfs')" 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.zykgl.sj.czl')" prop="czl">
+              <el-form-item :label="$t('page.business.resource.sj.czl')" prop="czl">
                 <el-input type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" >
                   <template slot="append">{{ form.kcdw }}</template>
                 </el-input>
@@ -39,7 +39,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.sj.yuanyin')" prop="remark">
+              <el-form-item :label="$t('page.business.resource.sj.yuanyin')" prop="remark">
                 <el-input type="textarea" :rows="2" v-model="form.remark" maxlength="500" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
@@ -93,14 +93,14 @@ export default {
       form: {},
       rules: {
         czfs: [
-          { required: true, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { 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.zykgl.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
         ],
         remark: [
-          { required: true, message: this.$t('page.business.zykgl.sj.yuanyin') + this.$t('form.notEmpty'), trigger: "change" },
+          { 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" },
diff --git a/src/views/business/resource/sj/comps/CzBatch.vue b/src/views/business/resource/sj/comps/CzBatch.vue
index 382269d..e1143fe 100644
--- a/src/views/business/resource/sj/comps/CzBatch.vue
+++ b/src/views/business/resource/sj/comps/CzBatch.vue
@@ -1,28 +1,28 @@
 G<template>
   <div>
     <!-- 处置试剂弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.cz')" :visible.sync="open" width="1200px" append-to-body
+    <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.zykgl.sj.mc')" align="left" prop="mc"
+              <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.zykgl.sj.bh')" align="left" prop="bh"
+              <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.zykgl.sj.sjczfs')" align="center" width="250px">
+              <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.zykgl.sj.yuanyin')" align="center">
+              <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.zykgl.sj.czl')" align="center">
+              <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>
@@ -85,14 +85,14 @@ export default {
       form: {},
       rules: {
         czfs: [
-          { required: true, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { 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.zykgl.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
         ],
         remark: [
-          { required: true, message: this.$t('page.business.zykgl.sj.yuanyin') + this.$t('form.notEmpty'), trigger: "change" },
+          { 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" },
diff --git a/src/views/business/resource/sj/comps/Ff.vue b/src/views/business/resource/sj/comps/Ff.vue
index f5c8976..9acf599 100644
--- a/src/views/business/resource/sj/comps/Ff.vue
+++ b/src/views/business/resource/sj/comps/Ff.vue
@@ -1,10 +1,10 @@
 G<template>
   <div >
     <!-- 发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.fafang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.fafang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+           <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">
@@ -15,7 +15,7 @@ G<template>
         <template v-else>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -23,7 +23,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue
index 5837ebb..3cb847d 100644
--- a/src/views/business/resource/sj/comps/Gd.vue
+++ b/src/views/business/resource/sj/comps/Gd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.guidang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.sj.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">
diff --git a/src/views/business/resource/sj/comps/Gh.vue b/src/views/business/resource/sj/comps/Gh.vue
index 9990905..2cae141 100644
--- a/src/views/business/resource/sj/comps/Gh.vue
+++ b/src/views/business/resource/sj/comps/Gh.vue
@@ -1,10 +1,10 @@
 G<template>
   <div >
     <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+           <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">
@@ -15,7 +15,7 @@ G<template>
         <template v-else>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -23,7 +23,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/sj/comps/Jd.vue b/src/views/business/resource/sj/comps/Jd.vue
index 9ca054d..1a2845b 100644
--- a/src/views/business/resource/sj/comps/Jd.vue
+++ b/src/views/business/resource/sj/comps/Jd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.sj.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">
diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue
index 41616b2..b620016 100644
--- a/src/views/business/resource/sj/comps/Js.vue
+++ b/src/views/business/resource/sj/comps/Js.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.sj.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">
diff --git a/src/views/business/resource/sj/comps/Jy.vue b/src/views/business/resource/sj/comps/Jy.vue
index cc815f1..1e470fd 100644
--- a/src/views/business/resource/sj/comps/Jy.vue
+++ b/src/views/business/resource/sj/comps/Jy.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 借阅弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.sj.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.zykgl.sj.jieyuesj')" prop="qmyy">
+            <el-form-item :label="$t('page.business.resource.sj.jieyuesj')" prop="qmyy">
               <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: 100%" />
diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue
index de329f9..b2f1997 100644
--- a/src/views/business/resource/sj/comps/Sd.vue
+++ b/src/views/business/resource/sj/comps/Sd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.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">
diff --git a/src/views/business/resource/sj/comps/SelectList.vue b/src/views/business/resource/sj/comps/SelectList.vue
index a4cba7f..ebabe16 100644
--- a/src/views/business/resource/sj/comps/SelectList.vue
+++ b/src/views/business/resource/sj/comps/SelectList.vue
@@ -1,8 +1,8 @@
 G<template>
   <div class="app-container">
     <el-table :data="selectList" border>
-      <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
+      <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="left" prop="bh" :show-overflow-tooltip="true" />
     </el-table>
   </div>
 </template>
diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue
index 4cf6733..69864e2 100644
--- a/src/views/business/resource/sj/comps/Xgkc.vue
+++ b/src/views/business/resource/sj/comps/Xgkc.vue
@@ -1,11 +1,11 @@
 G<template>
   <div >
     <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.sj.xgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.sj.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="24">
-              <el-form-item :label="$t('page.business.zykgl.sj.kcl')" prop="kcl">
+              <el-form-item :label="$t('page.business.resource.sj.kcl')" prop="kcl">
                 <el-input type="text" v-model="form.kcl" maxlength="50" :placeholder="$t('form.placeholderInput')" >
                   <template slot="append">{{ form.kcdw }}</template>
                 </el-input>
diff --git a/src/views/business/resource/sj/comps/Ysff.vue b/src/views/business/resource/sj/comps/Ysff.vue
index 6350ec1..1820735 100644
--- a/src/views/business/resource/sj/comps/Ysff.vue
+++ b/src/views/business/resource/sj/comps/Ysff.vue
@@ -1,10 +1,10 @@
 G<template>
   <div >
     <!-- 钥匙发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.ysff')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.ysff')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+           <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">
@@ -15,7 +15,7 @@ G<template>
         <template v-else>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <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>
@@ -23,7 +23,7 @@ G<template>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <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>
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue
index f482a39..a8f44f5 100644
--- a/src/views/business/resource/sj/list.vue
+++ b/src/views/business/resource/sj/list.vue
@@ -11,43 +11,43 @@
       <div class="app-container sj">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true">
           <!-- 名称 -->
-          <el-form-item :label="$t('page.business.zykgl.sj.mc') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.mc') + '：'">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.zykgl.sj.bh') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.bh') + '：'">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
            <!-- 所属部门 -->
-          <el-form-item :label="$t('page.business.zykgl.sj.ssbm') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.ssbm') + '：'">
             <el-input v-model="queryParams.bm" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 借阅状态 -->
-          <el-form-item :label="$t('page.business.zykgl.sj.jyzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.jyzt') + '：'">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option key="1" :label="$t('page.business.zykgl.jyzt.wjy')" value="1" />
-              <el-option key="3" :label="$t('page.business.zykgl.jyzt.djy')" value="3" />
-              <el-option key="5" :label="$t('page.business.zykgl.jyzt.jyz')" value="5" />
+              <el-option key="1" :label="$t('page.business.resource.jyzt.wjy')" value="1" />
+              <el-option key="3" :label="$t('page.business.resource.jyzt.djy')" value="3" />
+              <el-option key="5" :label="$t('page.business.resource.jyzt.jyz')" value="5" />
             </el-select>
           </el-form-item>
           <!-- 制剂状态 -->
-          <el-form-item :label="$t('page.business.zykgl.sj.zjzt') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.zjzt') + '：'">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
-              <el-option key="1" :label="$t('page.business.zykgl.zjzt.rk')" value="1" />
-              <el-option key="3" :label="$t('page.business.zykgl.zjzt.yff')" value="3" />
-              <el-option key="5" :label="$t('page.business.zykgl.zjzt.ysd')" value="5" />
-              <el-option key="7" :label="$t('page.business.zykgl.zjzt.dgd')" value="7" />
-              <el-option key="9" :label="$t('page.business.zykgl.zjzt.gd')" value="9" />
-              <el-option key="11" :label="$t('page.business.zykgl.zjzt.djd')" value="11" />
+              <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-select>
           </el-form-item>
           <!-- 失效日期 -->
-          <el-form-item :label="$t('page.business.zykgl.sj.sxrq') + '：'">
+          <el-form-item :label="$t('page.business.resource.sj.sxrq') + '：'">
             <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;" />
@@ -63,70 +63,70 @@
             <!-- 更新试剂库 -->
             <el-button type="primary"
               v-hasPermi="['business:resource:mjy:ff']">{{
-                $t('page.business.zykgl.sj.gxsjk') }}</el-button>
+                $t('page.business.resource.sj.gxsjk') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量处置 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlcz"
               v-hasPermi="['business:resource:mjy:czyj']">{{
-                $t('page.business.zykgl.sj.plcz') }}</el-button>
+                $t('page.business.resource.sj.plcz') }}</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.zykgl.mjy.plsd') }}</el-button>
+                $t('page.business.resource.mjy.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.zykgl.mjy.plgd') }}</el-button>
+                $t('page.business.resource.mjy.plgd') }}</el-button>
           </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
-          <el-table-column :label="$t('page.business.zykgl.sj.mc')" align="left" prop="mc"
+          <el-table-column :label="$t('page.business.resource.sj.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.sj.bh')" align="center" prop="bh"
+          <el-table-column :label="$t('page.business.resource.sj.bh')" align="center" prop="bh"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.sj.nd')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.sj.nd')" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.nd }}{{ scope.row.nddw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.sj.kcl')" align="center">
+          <el-table-column :label="$t('page.business.resource.sj.kcl')" align="center">
             <template slot-scope="scope">
               {{ scope.row.kc }}{{ scope.row.kcdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.sj.gg')" align="center" prop="gg" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.sj.ly')" align="center" prop="ly" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.sj.ssbm')" align="center" prop="ssbm" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.sj.sssy')" align="center" prop="sssy" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.sj.ph')" align="center" prop="ph" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.sj.yxzq')" align="center" prop="yxzq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.gg')" align="center" prop="gg" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.ly')" align="center" prop="ly" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.ssbm')" align="center" prop="ssbm" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.ph')" align="center" prop="ph" width="150px" />
+          <el-table-column :label="$t('page.business.resource.sj.yxzq')" align="center" prop="yxzq" width="150px" />
 
-          <el-table-column :label="$t('page.business.zykgl.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.cctj')" align="center" prop="cctj" width="130px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
+          <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.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.zykgl.mjy.zjzt')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="150px">
             <template slot-scope="scope">
-              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.zykgl.zjzt.rk') }}</span>
-              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
-              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.zykgl.zjzt.ysd') }}</span>
-              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.zykgl.zjzt.dgd') }}</span>
-              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.zykgl.zjzt.gd') }}</span>
-              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
+              <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>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" width="150px">
             <template slot-scope="scope">
-              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+              <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-column :label="$t('form.operate')" fixed="right" align="center"
@@ -135,11 +135,11 @@
               <!-- 详情 -->
               <el-button type="text" @click="handleXq(scope.row)"
                 v-hasPermi="['business:resource:mjy:list']">{{
-                  $t('page.business.zykgl.sj.detail') }}</el-button>
+                  $t('page.business.resource.sj.detail') }}</el-button>
               <!-- 处置 -->
               <el-button type="text" @click="handleCz(scope.row)"
                 v-hasPermi="['business:resource:mjy:czyj']">{{
-                  $t('page.business.zykgl.sj.cz') }}</el-button>
+                  $t('page.business.resource.sj.cz') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" @click="handleBj(scope.row)"
                 v-hasPermi="['business:resource:mjy:bj']">{{
@@ -147,27 +147,27 @@
               <!-- 修改库存 -->
               <el-button type="text" @click="handleXgkc(scope.row)"
                 v-hasPermi="['business:resource:mjy:xgkc']">{{
-                  $t('page.business.zykgl.sj.xgkc') }}</el-button>
+                  $t('page.business.resource.sj.xgkc') }}</el-button>
               <!-- 锁定 -->
               <el-button type="text" @click="handleSd(scope.row)"
                 v-hasPermi="['business:resource:mjy:sd']">{{
-                  $t('page.business.zykgl.sj.lock') }}</el-button>
+                  $t('page.business.resource.sj.lock') }}</el-button>
               <!-- 解锁 -->
               <el-button type="text" @click="handleJs(scope.row)"
                 v-hasPermi="['business:resource:mjy:js']">{{
-                  $t('page.business.zykgl.sj.unlock') }}</el-button>
+                  $t('page.business.resource.sj.unlock') }}</el-button>
               <!-- 归档 -->
               <el-button type="text" @click="handleGd(scope.row)"
                 v-hasPermi="['business:resource:mjy:gd']">{{
-                  $t('page.business.zykgl.sj.guidang') }}</el-button>
+                  $t('page.business.resource.sj.guidang') }}</el-button>
               <!-- 解档 -->
               <el-button type="text" @click="handleJd(scope.row)"
                 v-hasPermi="['business:resource:mjy:jd']">{{
-                  $t('page.business.zykgl.sj.jiedang') }}</el-button>
+                  $t('page.business.resource.sj.jiedang') }}</el-button>
               <!-- 借阅 -->
               <el-button type="text" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:mjy:jy']">{{
-                  $t('page.business.zykgl.sj.jieyue') }}</el-button>
+                  $t('page.business.resource.sj.jieyue') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/business/resource/yq/comps/detail.vue b/src/views/business/resource/yq/comps/detail.vue
index 5b5e14e..a1c9214 100644
--- a/src/views/business/resource/yq/comps/detail.vue
+++ b/src/views/business/resource/yq/comps/detail.vue
@@ -6,45 +6,45 @@
       <el-form ref="form" :model="form" label-width="130px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqmc')" prop="mc">
+            <el-form-item :label="$t('page.business.resource.yq.yqmc')" prop="mc">
               <el-input v-model="form.mc" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqbh')" prop="bh">
+            <el-form-item :label="$t('page.business.resource.yq.yqbh')" prop="bh">
               <el-input v-model="form.bh" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqxh')" prop="xh">
+            <el-form-item :label="$t('page.business.resource.yq.yqxh')" prop="xh">
               <el-input v-model="form.xh" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqly')" prop="ly">
+            <el-form-item :label="$t('page.business.resource.yq.yqly')" prop="ly">
               <el-input v-model="form.ly" disabled :placeholder="$t('form.placeholderInput')" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.xcjzrq')" prop="jzrq">
+            <el-form-item :label="$t('page.business.resource.yq.xcjzrq')" prop="jzrq">
               <el-date-picker clearable v-model="form.jzrq" type="date" value-format="yyyy-MM-dd"
                 :placeholder="$t('form.placeholderSelect')" style="width: 100%;" disabled>
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.ssbm')" prop="bmId">
+            <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmId">
               <el-input v-model="form.bmId" :placeholder="$t('form.placeholderSelect')" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.wc')" prop="wc">
+            <el-form-item :label="$t('page.business.resource.yq.wc')" prop="wc">
               <el-input v-model="form.wc" :placeholder="$t('form.placeholderSelect')" disabled />
             </el-form-item>
           </el-col>
@@ -62,7 +62,7 @@
         <el-table-column :label="$t('form.signer')" align="center" prop="bh" />
         <el-table-column :label="$t('form.qmyy')" align="center" prop="xh" />
         <el-table-column :label="$t('form.signTime')" align="center" prop="ly" />
-        <el-table-column :label="$t('page.business.zykgl.yq.xgnr')" align="center" prop="bmMc" />
+        <el-table-column :label="$t('page.business.resource.yq.xgnr')" align="center" prop="bmMc" />
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index 5ba06af..e4379fb 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item :label="$t('page.business.zykgl.yq.yqbh') + '：'" prop="bh">
+      <el-form-item :label="$t('page.business.resource.yq.yqbh') + '：'" prop="bh">
         <el-input v-model="queryParams.bh" placeholder="" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('page.business.zykgl.yq.yqmc') + '：'" prop="mc">
+      <el-form-item :label="$t('page.business.resource.yq.yqmc') + '：'" prop="mc">
         <el-input v-model="queryParams.mc" placeholder="" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item :label="$t('page.business.zykgl.yq.xcjzrq') + '：'" prop="jzrq">
+      <el-form-item :label="$t('page.business.resource.yq.xcjzrq') + '：'" prop="jzrq">
         <el-date-picker clearable v-model="dateRange" type="daterange" value-format="yyyy-MM-dd" range-separator="-"
           :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('page.business.zykgl.yq.ssbm') + '：'" prop="bmId">
+      <el-form-item :label="$t('page.business.resource.yq.ssbm') + '：'" prop="bmId">
         <el-input v-model="queryParams.bmId" placeholder="" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -31,16 +31,16 @@
     </el-row>
 
     <el-table v-loading="loading" :data="YqList">
-      <el-table-column :label="$t('page.business.zykgl.yq.yqmc')" align="center" prop="mc" />
-      <el-table-column :label="$t('page.business.zykgl.yq.yqbh')" align="center" prop="bh" />
-      <el-table-column :label="$t('page.business.zykgl.yq.yqxh')" align="center" prop="xh" />
-      <el-table-column :label="$t('page.business.zykgl.yq.yqly')" align="center" prop="ly" />
-      <el-table-column :label="$t('page.business.zykgl.yq.xcjzrq')" align="center" prop="jzrq" width="180" sortable>
+      <el-table-column :label="$t('page.business.resource.yq.yqmc')" align="center" prop="mc" />
+      <el-table-column :label="$t('page.business.resource.yq.yqbh')" align="center" prop="bh" />
+      <el-table-column :label="$t('page.business.resource.yq.yqxh')" align="center" prop="xh" />
+      <el-table-column :label="$t('page.business.resource.yq.yqly')" align="center" prop="ly" />
+      <el-table-column :label="$t('page.business.resource.yq.xcjzrq')" align="center" prop="jzrq" width="180" sortable>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.jzrq, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('page.business.zykgl.yq.ssbm')" align="center" prop="bmMc" />
+      <el-table-column :label="$t('page.business.resource.yq.ssbm')" align="center" prop="bmMc" />
       <el-table-column :label="$t('form.operate')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="text" @click="handleDetail(scope.row)">{{ $t('form.detail') }}</el-button>
@@ -57,45 +57,45 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqmc')" prop="mc">
+            <el-form-item :label="$t('page.business.resource.yq.yqmc')" prop="mc">
               <el-input v-model="form.mc" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqbh')" prop="bh">
+            <el-form-item :label="$t('page.business.resource.yq.yqbh')" prop="bh">
               <el-input v-model="form.bh" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqxh')" prop="xh">
+            <el-form-item :label="$t('page.business.resource.yq.yqxh')" prop="xh">
               <el-input v-model="form.xh" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.yqly')" prop="ly">
+            <el-form-item :label="$t('page.business.resource.yq.yqly')" prop="ly">
               <el-input v-model="form.ly" :placeholder="$t('form.placeholderInput')" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.xcjzrq')" prop="jzrq">
+            <el-form-item :label="$t('page.business.resource.yq.xcjzrq')" prop="jzrq">
               <el-date-picker clearable v-model="form.jzrq" type="date" value-format="yyyy-MM-dd"
                 :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.ssbm')" prop="bmId">
+            <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmId">
               <el-input v-model="form.bmId" :placeholder="$t('form.placeholderSelect')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.yq.wc')" prop="wc">
+            <el-form-item :label="$t('page.business.resource.yq.wc')" prop="wc">
               <BusinessSelect v-model="form.wc" dictType="system_business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
@@ -187,29 +187,29 @@ export default {
       // 表单校验
       rules: {
         mc: [
-          { required: true, message: this.$t('page.business.zykgl.yq.yqmc')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.zykgl.yq.yqmc')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqmc')+ this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqmc')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         bh: [
-          { required: true, message: this.$t('page.business.zykgl.yq.yqbh')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.zykgl.yq.yqbh')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqbh')+ this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqbh')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         xh: [
-          { required: true, message: this.$t('page.business.zykgl.yq.yqxh')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.zykgl.yq.yqxh')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqxh')+ this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqxh')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         ly: [
-          { required: true, message: this.$t('page.business.zykgl.yq.yqly')+ this.$t('form.notEmpty'), trigger: "change" },
-          { min: 0, max: 50, message: this.$t('page.business.zykgl.yq.yqly')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+          { required: true, message: this.$t('page.business.resource.yq.yqly')+ this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.resource.yq.yqly')+ this.$t('form.lengthLimit') + '50', trigger: 'blur' }
         ],
         jzrq: [
-          { required: true, message: this.$t('page.business.zykgl.yq.xcjzrq')+ this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.yq.xcjzrq')+ this.$t('form.notEmpty'), trigger: "change" },
         ],
         bmId: [
-          { required: true, message: this.$t('page.business.zykgl.yq.ssbm')+ this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.yq.ssbm')+ this.$t('form.notEmpty'), trigger: "change" },
         ],
         wc: [
-          { required: true, message: this.$t('page.business.zykgl.yq.wc')+ this.$t('form.notEmpty'), trigger: "change" },
+          { required: true, message: this.$t('page.business.resource.yq.wc')+ this.$t('form.notEmpty'), trigger: "change" },
         ],
         qmrmm: [
           { required: true, message: this.$t('form.signerPsw')+ this.$t('form.notEmpty'), trigger: "change" },
diff --git a/src/views/business/resource/zcg/comps/SelectList.vue b/src/views/business/resource/zcg/comps/SelectList.vue
index 78d91bd..055b115 100644
--- a/src/views/business/resource/zcg/comps/SelectList.vue
+++ b/src/views/business/resource/zcg/comps/SelectList.vue
@@ -1,10 +1,10 @@
 G<template>
   <div class="app-container">
     <el-table :data="selectList" border>
-      <el-table-column :label="$t('page.business.zykgl.zcg.zcg')" align="left" prop="mc" width="200px" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.glyj')" align="center" prop="glyj" />
+      <el-table-column :label="$t('page.business.resource.zcg.zcg')" align="left" prop="mc" width="200px" />
+      <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
+      <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
+      <el-table-column :label="$t('page.business.resource.zcg.glyj')" align="center" prop="glyj" />
     </el-table>
   </div>
 </template>
diff --git a/src/views/business/resource/zcg/comps/Ysff.vue b/src/views/business/resource/zcg/comps/Ysff.vue
index 1033d85..fb8011f 100644
--- a/src/views/business/resource/zcg/comps/Ysff.vue
+++ b/src/views/business/resource/zcg/comps/Ysff.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <!-- 钥匙发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.zcg.ysff')" :visible.sync="open" width="800px" append-to-body
+    <el-dialog :title="$t('page.business.resource.zcg.ysff')" :visible.sync="open" width="800px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.zcg')" prop="mc">
+            <el-form-item :label="$t('page.business.resource.zcg.zcg')" 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-form-item :label="$t('page.business.zykgl.zcg.glyj')" prop="glyj">
+            <el-form-item :label="$t('page.business.resource.zcg.glyj')" prop="glyj">
               <el-input type="text" v-model="form.glyj" maxlength="500" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -36,37 +36,37 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.lqr1Id')" prop="lqr1Id">
+            <el-form-item :label="$t('page.business.resource.zcg.lqr1Id')" prop="lqr1Id">
               <el-input type="text" v-model="form.lqr1Id" maxlength="50" :placeholder="$t('form.placeholderSelect')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.lqr1mm')" prop="lqr1mm">
+            <el-form-item :label="$t('page.business.resource.zcg.lqr1mm')" prop="lqr1mm">
               <el-input type="text" v-model="form.lqr1mm" 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.zykgl.zcg.lqr2Id')" prop="lqr2Id">
+            <el-form-item :label="$t('page.business.resource.zcg.lqr2Id')" prop="lqr2Id">
               <el-input type="text" v-model="form.lqr2Id" maxlength="50" :placeholder="$t('form.placeholderSelect')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.lqr2mm')" prop="lqr2mm">
+            <el-form-item :label="$t('page.business.resource.zcg.lqr2mm')" prop="lqr2mm">
               <el-input type="text" v-model="form.lqr2mm" 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.zykgl.zcg.ffr')">
+            <el-form-item :label="$t('page.business.resource.zcg.ffr')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.ffrmm')" prop="ffrmm">
+            <el-form-item :label="$t('page.business.resource.zcg.ffrmm')" prop="ffrmm">
               <el-input type="text" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/zcg/comps/Ysgh.vue b/src/views/business/resource/zcg/comps/Ysgh.vue
index d38ffde..5374c20 100644
--- a/src/views/business/resource/zcg/comps/Ysgh.vue
+++ b/src/views/business/resource/zcg/comps/Ysgh.vue
@@ -1,11 +1,11 @@
 G<template>
   <div class="app-container">
     <!-- 钥匙归还弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.zcg.ysgh')" :visible.sync="open" width="1000px" append-to-body
+    <el-dialog :title="$t('page.business.resource.zcg.ysgh')" :visible.sync="open" width="1000px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <template v-if="isBatch">
-          <el-alert :title="$t('page.business.zykgl.zcg.ysghts') " type="error" :closable="false">
+          <el-alert :title="$t('page.business.resource.zcg.ysghts') " type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
@@ -16,13 +16,13 @@ G<template>
         <template v-else>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.zykgl.zcg.zcg')" prop="mc">
+              <el-form-item :label="$t('page.business.resource.zcg.zcg')" 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-form-item :label="$t('page.business.zykgl.zcg.glyj')" prop="glyj">
+              <el-form-item :label="$t('page.business.resource.zcg.glyj')" prop="glyj">
                 <el-input type="text" v-model="form.glyj" maxlength="50" disabled
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
@@ -31,37 +31,37 @@ G<template>
         </template>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.ghr1Id')" prop="ghr1Id">
+            <el-form-item :label="$t('page.business.resource.zcg.ghr1Id')" prop="ghr1Id">
               <el-input type="text" v-model="form.ghr1Id" maxlength="50" :placeholder="$t('form.placeholderSelect')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.ghr1mm')" prop="ghr1mm">
+            <el-form-item :label="$t('page.business.resource.zcg.ghr1mm')" prop="ghr1mm">
               <el-input type="text" v-model="form.ghr1mm" 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.zykgl.zcg.ghr2Id')" prop="ghr2Id">
+            <el-form-item :label="$t('page.business.resource.zcg.ghr2Id')" prop="ghr2Id">
               <el-input type="text" v-model="form.ghr2Id" maxlength="50" :placeholder="$t('form.placeholderSelect')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.ghr2mm')" prop="ghr2mm">
+            <el-form-item :label="$t('page.business.resource.zcg.ghr2mm')" prop="ghr2mm">
               <el-input type="text" v-model="form.ghr2mm" 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.zykgl.zcg.jsr')">
+            <el-form-item :label="$t('page.business.resource.zcg.jsr')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.jsrmm')" prop="jsrmm">
+            <el-form-item :label="$t('page.business.resource.zcg.jsrmm')" prop="jsrmm">
               <el-input type="text" v-model="form.jsrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -69,7 +69,7 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="$t('page.business.zykgl.zcg.ysgh')" maxlength="50" disabled
+              <el-input type="text" :value="$t('page.business.resource.zcg.ysgh')" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/zcg/list.vue b/src/views/business/resource/zcg/list.vue
index 0f1461c..69dec75 100644
--- a/src/views/business/resource/zcg/list.vue
+++ b/src/views/business/resource/zcg/list.vue
@@ -2,19 +2,19 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
       <!-- 暂存柜 -->
-      <el-form-item :label="$t('page.business.zykgl.zcg.zcg') + '：'">
+      <el-form-item :label="$t('page.business.resource.zcg.zcg') + '：'">
         <el-input v-model="queryParams.mc" clearable @change="handleQuery" :placeholder="$t('form.placeholderInput')" />
       </el-form-item>
       <!-- 借阅人 -->
-      <el-form-item :label="$t('page.business.zykgl.zcg.jyr') + '：'">
+      <el-form-item :label="$t('page.business.resource.zcg.jyr') + '：'">
         <el-input v-model="queryParams.jyrId" clearable @change="handleQuery"
           :placeholder="$t('form.placeholderInput')" />
       </el-form-item>
       <!-- 状态 -->
-      <el-form-item :label="$t('page.business.zykgl.zcg.zt') + '：'">
+      <el-form-item :label="$t('page.business.resource.zcg.zt') + '：'">
         <el-select v-model="queryParams.zt" :placeholder="$t('form.placeholderSelect')" clearable @change="handleQuery">
-          <el-option key="5" :label="$t('page.business.zykgl.zcg.jyz')" value="5" />
-          <el-option key="1" :label="$t('page.business.zykgl.zcg.wjy')" value="1" />
+          <el-option key="5" :label="$t('page.business.resource.zcg.jyz')" value="5" />
+          <el-option key="1" :label="$t('page.business.resource.zcg.wjy')" value="1" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -28,23 +28,23 @@
         <!-- 批量归还 -->
         <el-button type="primary" :disabled="multiple" @click="handlePlgh"
           v-hasPermi="['business:resource:zcg:ysgh']">{{
-            $t('page.business.zykgl.zcg.plgh') }}</el-button>
+            $t('page.business.resource.zcg.plgh') }}</el-button>
       </el-col>
     </el-row>
 
     <el-table v-loading="loading" :data="ZcgList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.zcg')" align="left" prop="mc"
+      <el-table-column :label="$t('page.business.resource.zcg.zcg')" align="left" prop="mc"
         :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.zt')" align="center" width="150px">
+      <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
+      <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
+      <el-table-column :label="$t('page.business.resource.zcg.zt')" align="center" width="150px">
         <template slot-scope="scope">
-          <span v-if="scope.row.zt == 1">{{ $t('page.business.zykgl.zcg.wjy') }}</span>
-          <span v-if="scope.row.zt == 5">{{ $t('page.business.zykgl.zcg.jyz') }}</span>
+          <span v-if="scope.row.zt == 1">{{ $t('page.business.resource.zcg.wjy') }}</span>
+          <span v-if="scope.row.zt == 5">{{ $t('page.business.resource.zcg.jyz') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('page.business.zykgl.zcg.glyj')" align="center" prop="glyj"
+      <el-table-column :label="$t('page.business.resource.zcg.glyj')" align="center" prop="glyj"
         :show-overflow-tooltip="true" />
       <el-table-column :label="$t('form.operate')" align="center" fixed="right" class-name="small-padding fixed-width"
         width="150px">
@@ -52,11 +52,11 @@
           <!-- 钥匙发放 -->
           <el-button type="text" v-if="scope.row.zt == 1" @click="handleffys(scope.row)"
             v-hasPermi="['business:resource:zcg:ysff']">{{
-              $t('page.business.zykgl.zcg.ysff') }}</el-button>
+              $t('page.business.resource.zcg.ysff') }}</el-button>
           <!-- 钥匙归还 -->
           <el-button type="text" v-if="scope.row.zt == 5" @click="handleghys(scope.row)"
             v-hasPermi="['business:resource:zcg:ysgh']">{{
-              $t('page.business.zykgl.zcg.gh') }}</el-button>
+              $t('page.business.resource.zcg.gh') }}</el-button>
         </template>
       </el-table-column>
     </el-table>