diff --git a/src/lang/zh/business/resource/sj/sj.js b/src/lang/zh/business/resource/sj/sj.js
index e5f3e6e..f05c719 100644
--- a/src/lang/zh/business/resource/sj/sj.js
+++ b/src/lang/zh/business/resource/sj/sj.js
@@ -33,6 +33,7 @@ export default {
     guidang:'归档',
     jiedang:'解档',
     jieyue:'借阅',
+    jieyuesj: '借阅时间',
     guihuan:'归还',
     fafang:'发放',
     ysff:'钥匙发放',
diff --git a/src/views/business/resource/sj/comps/Czrq.vue b/src/views/business/resource/sj/comps/Czrq.vue
deleted file mode 100644
index e9efb90..0000000
--- a/src/views/business/resource/sj/comps/Czrq.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-G<template>
-  <div >
-    <!-- 处置容器弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.czrq')" :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>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/sj/comps/Czyj.vue b/src/views/business/resource/sj/comps/Czyj.vue
deleted file mode 100644
index c166c7a..0000000
--- a/src/views/business/resource/sj/comps/Czyj.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-G<template>
-  <div >
-    <!-- 处置药剂弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.czyj')" :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>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue
index 319bdb5..5837ebb 100644
--- a/src/views/business/resource/sj/comps/Gd.vue
+++ b/src/views/business/resource/sj/comps/Gd.vue
@@ -1,35 +1,8 @@
 G<template>
   <div >
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guidang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.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">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.gdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -58,7 +31,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -77,7 +50,7 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyGd",
+  name: "SjGd",
   components: { SelectList },
   data() {
     return {
diff --git a/src/views/business/resource/sj/comps/Jd.vue b/src/views/business/resource/sj/comps/Jd.vue
index 1a419c2..9ca054d 100644
--- a/src/views/business/resource/sj/comps/Jd.vue
+++ b/src/views/business/resource/sj/comps/Jd.vue
@@ -1,35 +1,8 @@
 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.zykgl.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">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -77,7 +50,7 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyJd",
+  name: "SjJd",
   components: { SelectList },
   data() {
     return {
diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue
index 51321b3..41616b2 100644
--- a/src/views/business/resource/sj/comps/Js.vue
+++ b/src/views/business/resource/sj/comps/Js.vue
@@ -1,24 +1,8 @@
 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.zykgl.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">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -65,7 +49,7 @@ import { mjy_js } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 
 export default {
-  name: "MjyJs",
+  name: "SjJs",
   data() {
     return {
       open: false,
@@ -96,7 +80,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁麻精药',
+        qmyy: '解锁试剂',
         sdrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/sj/comps/Jy.vue b/src/views/business/resource/sj/comps/Jy.vue
index ef5352c..cc815f1 100644
--- a/src/views/business/resource/sj/comps/Jy.vue
+++ b/src/views/business/resource/sj/comps/Jy.vue
@@ -1,35 +1,17 @@
 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-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>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
+    <el-dialog :title="$t('page.business.zykgl.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-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%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -77,7 +59,7 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
+  name: "SjJy",
   components: { SelectList },
   data() {
     return {
@@ -86,6 +68,7 @@ export default {
       selectList: [],
       open: false,
       form: {},
+      daterange: [],
       rules: {
         sdrmm: [{
           required: true,
@@ -119,7 +102,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: '申请借阅',
         sdrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue
index ead4034..de329f9 100644
--- a/src/views/business/resource/sj/comps/Sd.vue
+++ b/src/views/business/resource/sj/comps/Sd.vue
@@ -3,33 +3,6 @@ G<template>
     <!-- 锁定弹窗 -->
     <el-dialog :title="$t('page.business.zykgl.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">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.sdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -77,7 +50,7 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjySd",
+  name: "SjSd",
   components: { SelectList },
   data() {
     return {
@@ -119,7 +92,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定麻精药',
+        qmyy: '锁定试剂',
         sdrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/sj/comps/Shbj.vue b/src/views/business/resource/sj/comps/Shbj.vue
deleted file mode 100644
index eadbc83..0000000
--- a/src/views/business/resource/sj/comps/Shbj.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-G<template>
-  <div >
-    <!-- 审核编辑弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.shbj')" :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>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/sj/comps/Shxgkc.vue b/src/views/business/resource/sj/comps/Shxgkc.vue
deleted file mode 100644
index 371509f..0000000
--- a/src/views/business/resource/sj/comps/Shxgkc.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-G<template>
-  <div >
-    <!-- 审核修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.shxgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </template>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
-import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
-
-export default {
-  name: "MjyBj",
-  components: { SelectList },
-  data() {
-    return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
-      open: false,
-      form: {},
-      rules: {
-        sdrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
-    cancel() {
-      this.open = false
-    },
-    reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
-    },
-    save() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue
index ee1c6ad..4cf6733 100644
--- a/src/views/business/resource/sj/comps/Xgkc.vue
+++ b/src/views/business/resource/sj/comps/Xgkc.vue
@@ -1,35 +1,17 @@
 G<template>
   <div >
     <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.xgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.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">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+        <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.zykgl.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>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -77,7 +59,7 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
+  name: "SjXgkc",
   components: { SelectList },
   data() {
     return {
@@ -119,7 +101,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        qmyy: '修改库存',
         sdrmm: null
       }
       this.resetForm("form")
@@ -132,6 +114,7 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
+      this.form.kcdw = row.kcdw
       this.open = true
     },
     save() {
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue
index 5f057e7..c657b48 100644
--- a/src/views/business/resource/sj/list.vue
+++ b/src/views/business/resource/sj/list.vue
@@ -135,59 +135,39 @@
               <!-- 详情 -->
               <el-button size="mini" type="text" @click="handleXq(scope.row)"
                 v-hasPermi="['business:resource:mjy:list']">{{
-                  $t('page.business.zykgl.mjy.detail') }}</el-button>
-              <!-- 发放 -->
-              <el-button size="mini" type="text" @click="handleFf(scope.row)"
-                v-hasPermi="['business:resource:mjy:ff']">{{
-                  $t('page.business.zykgl.mjy.fafang') }}</el-button>
-              <!-- 处置药剂 -->
+                  $t('page.business.zykgl.sj.detail') }}</el-button>
+              <!-- 处置 -->
               <el-button size="mini" type="text" @click="handleCz(scope.row)"
                 v-hasPermi="['business:resource:mjy:czyj']">{{
                   $t('page.business.zykgl.sj.cz') }}</el-button>
-              <!-- 处置容器 -->
-              <el-button size="mini" type="text" @click="handleCzrq(scope.row)"
-                v-hasPermi="['business:resource:mjy:czrq']">{{
-                  $t('page.business.zykgl.mjy.czrq') }}</el-button>
               <!-- 编辑 -->
               <el-button size="mini" type="text" @click="handleBj(scope.row)"
                 v-hasPermi="['business:resource:mjy:bj']">{{
                   $t('form.edit') }}</el-button>
-              <!-- 审核编辑 -->
-              <el-button size="mini" type="text" @click="handleShbj(scope.row)"
-                v-hasPermi="['business:resource:mjy:shbj']">{{
-                  $t('page.business.zykgl.mjy.shbj') }}</el-button>
               <!-- 修改库存 -->
               <el-button size="mini" type="text" @click="handleXgkc(scope.row)"
                 v-hasPermi="['business:resource:mjy:xgkc']">{{
-                  $t('page.business.zykgl.mjy.xgkc') }}</el-button>
-              <!-- 审核修改库存 -->
-              <el-button size="mini" type="text" @click="handleShxgkc(scope.row)"
-                v-hasPermi="['business:resource:mjy:shxgkc']">{{
-                  $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
+                  $t('page.business.zykgl.sj.xgkc') }}</el-button>
               <!-- 锁定 -->
               <el-button size="mini" type="text" @click="handleSd(scope.row)"
                 v-hasPermi="['business:resource:mjy:sd']">{{
-                  $t('page.business.zykgl.mjy.lock') }}</el-button>
+                  $t('page.business.zykgl.sj.lock') }}</el-button>
               <!-- 解锁 -->
               <el-button size="mini" type="text" @click="handleJs(scope.row)"
                 v-hasPermi="['business:resource:mjy:js']">{{
-                  $t('page.business.zykgl.mjy.unlock') }}</el-button>
+                  $t('page.business.zykgl.sj.unlock') }}</el-button>
               <!-- 归档 -->
               <el-button size="mini" type="text" @click="handleGd(scope.row)"
                 v-hasPermi="['business:resource:mjy:gd']">{{
-                  $t('page.business.zykgl.mjy.guidang') }}</el-button>
+                  $t('page.business.zykgl.sj.guidang') }}</el-button>
               <!-- 解档 -->
               <el-button size="mini" type="text" @click="handleJd(scope.row)"
                 v-hasPermi="['business:resource:mjy:jd']">{{
-                  $t('page.business.zykgl.mjy.jiedang') }}</el-button>
+                  $t('page.business.zykgl.sj.jiedang') }}</el-button>
               <!-- 借阅 -->
               <el-button size="mini" type="text" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:mjy:jy']">{{
-                  $t('page.business.zykgl.mjy.jieyue') }}</el-button>
-              <!-- 归还 -->
-              <el-button size="mini" type="text" @click="handleGh(scope.row)"
-                v-hasPermi="['business:resource:mjy:gh']">{{
-                  $t('page.business.zykgl.mjy.guihuan') }}</el-button>
+                  $t('page.business.zykgl.sj.jieyue') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -205,12 +185,8 @@
       <Jd ref="Jd" @callback="handleQuery" />
       <!-- 编辑 -->
       <Bj ref="Bj" @callback="handleQuery" />
-      <!-- 审核编辑 -->
-      <Shbj ref="Shbj" @callback="handleQuery" />
       <!-- 修改库存 -->
       <Xgkc ref="Xgkc" @callback="handleQuery" />
-      <!-- 审核修改库存 -->
-      <Shxgkc ref="Shxgkc" @callback="handleQuery" />
       <!-- 借阅 -->
       <Jy ref="Jy" @callback="handleQuery" />
       <!-- 归还 -->
@@ -221,10 +197,6 @@
       <Cz ref="Cz" @callback="handleQuery" />
       <!-- 批量处置 -->
       <CzBatch ref="CzBatch"/>
-      <!-- 处置容器 -->
-      <Czrq ref="Czrq" @callback="handleQuery" />
-      <!-- 钥匙发放 -->
-      <Ysff ref="Ysff" @callback="handleQuery" />
     </template>
   </div>
 </template>
@@ -237,21 +209,16 @@ import Gd from "./comps/Gd";
 import Jd from "./comps/Jd";
 import Xq from "./comps/Xq";
 import Bj from "./comps/Bj";
-import Shbj from "./comps/Shbj";
 import Xgkc from "./comps/Xgkc";
-import Shxgkc from "./comps/Shxgkc";
 import Jy from "./comps/Jy";
 import Gh from "./comps/Gh";
 import Ff from "./comps/Ff";
-import Czrq from "./comps/Czrq";
 import Cz from "./comps/Cz";
 import CzBatch from "./comps/CzBatch";
-import Czyj from "./comps/Czyj";
-import Ysff from "./comps/Ysff";
 
 export default {
   name: "Sj",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh,Czyj,Czrq, Cz, CzBatch, Ff,Ysff },
+  components: { Sd, Js, Gd, Xq, Jd, Bj, Xgkc,  Jy, Gh, Cz, CzBatch, Ff },
   data() {
     return {
       showDetail: false,
@@ -280,22 +247,6 @@ export default {
     this.getList()
   },
   methods: {
-     //钥匙发放
-    handleYsff() {
-      this.$refs.Ysff.showBatch(this.selectList)
-    },
-    //批量发放
-    handlePlff(row) {
-      this.$refs.Ff.showBatch(this.selectList)
-    },
-    //处置容器
-    handleCzrq(row) {
-      this.$refs.Czrq.show(row)
-    },
-     //批量处置容器
-    handlePlczrq() {
-      this.$refs.Czrq.showBatch(this.selectList)
-    },
     //处置
     handleCz(row) {
       this.$refs.Cz.show(row)
@@ -308,18 +259,10 @@ export default {
     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)