diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index 1a9ebf0..2bc6f12 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -18,29 +18,20 @@ export function mjy_info(query) {
   })
 }
 
-// 钥匙发放
-export function mjy_yygh(data) {
+// 锁定
+export function mjy_sd(data) {
   return request({
-    url: '/system/business/mjy/ysgh',
-    method: 'post',
-    data: data
-  })
-}
-
-//钥匙归还
-export function mjy_yyff(data) {
-  return request({
-    url: '/system/business/mjy/ysff',
+    url: '/system/business/mjy/sd',
     method: 'post',
     data: data
   })
 }
 
 
-//批量钥匙归还
-export function mjy_ysghBatch(data) {
+//批量锁定
+export function mjy_sdBatch(data) {
   return request({
-    url: '/system/business/mjy/ysghBatch',
+    url: '/system/business/mjy/sdBatch',
     method: 'post',
     data: data
   })
diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
new file mode 100644
index 0000000..ee08942
--- /dev/null
+++ b/src/api/business/public/public.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询暂存柜列表
+export function public_zcgList(query) {
+  return request({
+    url: '/system/business/public/zcgList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/business/zcg/zcg.js b/src/api/business/zcg/zcg.js
index 6b26049..8d1a2ce 100644
--- a/src/api/business/zcg/zcg.js
+++ b/src/api/business/zcg/zcg.js
@@ -18,8 +18,8 @@ export function zcg_info(query) {
   })
 }
 
-// 钥匙发放
-export function zcg_yygh(data) {
+// 钥匙归还
+export function zcg_ysgh(data) {
   return request({
     url: '/system/business/zcg/ysgh',
     method: 'post',
@@ -27,21 +27,22 @@ export function zcg_yygh(data) {
   })
 }
 
-//钥匙归还
-export function zcg_yyff(data) {
+
+//批量钥匙归还
+export function zcg_ysghBatch(data) {
   return request({
-    url: '/system/business/zcg/ysff',
+    url: '/system/business/zcg/ysghBatch',
     method: 'post',
     data: data
   })
 }
 
-
-//批量钥匙归还
-export function zcg_ysghBatch(data) {
+//钥匙发放
+export function zcg_ysff(data) {
   return request({
-    url: '/system/business/zcg/ysghBatch',
+    url: '/system/business/zcg/ysff',
     method: 'post',
     data: data
   })
-}
\ No newline at end of file
+}
+
diff --git a/src/lang/en.js b/src/lang/en.js
index da8bd7a..c63306d 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -20,6 +20,12 @@ export default {
     confirmDelete: 'confirm delete？',
     startDate:'start date',
     endDate:'end date',
+    password:'password',
+    signer:'signer',
+    remark:'remark',
+    qmyy:'签名意义',
+    lock:'lock',
+    unlock:'unlock',
   },
   menu: {
     PersonalCenter: 'Personal Center',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 29631c0..0a48372 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -20,6 +20,12 @@ export default {
     confirmDelete: '确认删除？',
     startDate:'开始日期',
     endDate:'结束日期',
+    password:'密码',
+    signer:'签名人',
+    qmyy:'签名意义',
+    remark:'备注',
+    lock:'锁定',
+    unlock:'解锁',
   },
   menu: {
     PersonalCenter: '个人中心',
@@ -234,8 +240,7 @@ export default {
           xgkc:'修改库存',
           shxgkc:'审核修改库存',
           shbj:'审核编辑',
-          sd:'锁定',
-          js:'解锁',
+          
           gd:'归档',
           jd:'解档',
           jy:'借阅',
diff --git a/src/views/business/comps/select/SelectZcg.vue b/src/views/business/comps/select/SelectZcg.vue
new file mode 100644
index 0000000..0c3428d
--- /dev/null
+++ b/src/views/business/comps/select/SelectZcg.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
+      <el-option v-for="item in list"  :key="item.id" :label="item.name" :value="item.id" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { public_zcgList } from "@/api/business/public/public";
+export default {
+  name: "SelectZcg",
+  components: {},
+  props: {
+    value: {
+      type: [Number, String , Array],
+      default: '',
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: ''
+    },
+    storeId: {
+      type: [Number, String ],
+      default: getStoreId()
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        if(!this.multiple){
+          this.selected = v ? parseInt(v) : ''
+        }else{
+          if(v){
+            //默认传的,分割的字符串，有传数组再改造
+            let arr = v.split(',')
+            let s = []
+            _.forEach(arr,a=>{
+              s.push(parseInt(a))
+            })
+            this.selected = s
+          }else{
+            this.selected = []
+          }
+        }
+      }
+    },
+    storeId: {
+      immediate: true,
+      handler(v) {
+        this.queryParam.storeId = v
+        this.getList()
+
+      }
+    },
+  },
+  data() {
+    return {
+      selected: '',
+      list: [],
+      queryParam:{
+        storeId:''
+      }
+    };
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.list = []
+      public_zcgList(this.queryParam).then(response => {
+        this.list = response.data || []
+      })
+    },
+    handleChange(val) {
+      this.$emit('input', this.multiple ? (val && val.length>0 ? val.join(','): ''):(val || ''))
+      //默认传的,分割的字符串，有传数组再改造
+      let res;
+      if(this.multiple){
+        res = this.list.filter(item=> {
+          return  val.includes(item.id)
+        })
+      }else {
+        res = this.list.find(item=> item.id === val)
+      }
+      this.$emit('change', res)
+    },
+  }
+};
+</script>
diff --git a/src/views/business/resource/mjy/comps/Sd.vue b/src/views/business/resource/mjy/comps/Sd.vue
new file mode 100644
index 0000000..098f043
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Sd.vue
@@ -0,0 +1,129 @@
+G<template>
+  <div class="app-container">
+    <!-- 锁定弹窗 -->
+    <el-dialog :title="$t('form.lock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="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_sd, mjy_sdBatch } from "@/api/business/mjy/mjy"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "MjySd",
+  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_sdBatch(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          } else {
+            mjy_sd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/mjy/list.vue b/src/views/business/resource/mjy/list.vue
index 3742190..62f6681 100644
--- a/src/views/business/resource/mjy/list.vue
+++ b/src/views/business/resource/mjy/list.vue
@@ -153,11 +153,11 @@
             v-hasPermi="['business:resource:mjy:shxgkc']">{{
               $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
           <!-- 锁定 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:sd']">{{
-            $t('page.business.zykgl.mjy.sd') }}</el-button>
+          <el-button size="mini" type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:mjy:sd']">{{
+            $t('form.lock') }}</el-button>
           <!-- 解锁 -->
           <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:js']">{{
-            $t('page.business.zykgl.mjy.js') }}</el-button>
+            $t('form.unlock') }}</el-button>
           <!-- 归档 -->
           <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:gd']">{{
             $t('page.business.zykgl.mjy.gd') }}</el-button>
@@ -177,14 +177,18 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
+    <!-- 锁定 -->
+    <Sd ref="Sd" @callback="handleQuery" />
   </div>
 </template>
 
 <script>
-import { mjy_list, mjy_info } from "@/api/business/mjy/mjy"
+import { mjy_list } from "@/api/business/mjy/mjy"
+import Sd from "./comps/Sd";
 
 export default {
   name: "Mjy",
+  components: { Sd },
   data() {
     return {
       daterange: [],
@@ -212,6 +216,13 @@ export default {
     this.getList()
   },
   methods: {
+    handlePlsd(){
+      debugger
+      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]
diff --git a/src/views/business/resource/zcg/comps/Ysff.vue b/src/views/business/resource/zcg/comps/Ysff.vue
index 70b3071..c4004f9 100644
--- a/src/views/business/resource/zcg/comps/Ysff.vue
+++ b/src/views/business/resource/zcg/comps/Ysff.vue
@@ -19,15 +19,15 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.qmyy')" prop="qmyy">
-              <el-input type="text" :value="$t('page.business.zykgl.zcg.ysff')" maxlength="50" disabled
+            <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('page.business.zykgl.zcg.remark')" prop="remark">
+            <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>
@@ -85,7 +85,7 @@ import { zcg_yyff } from "@/api/business/zcg/zcg"
 import { mapGetters } from 'vuex'
 
 export default {
-  name: "Zcg",
+  name: "ZcgYsff",
   data() {
     return {
       open: false,
diff --git a/src/views/business/resource/zcg/comps/Ysgh.vue b/src/views/business/resource/zcg/comps/Ysgh.vue
index bb8c1aa..d1e5814 100644
--- a/src/views/business/resource/zcg/comps/Ysgh.vue
+++ b/src/views/business/resource/zcg/comps/Ysgh.vue
@@ -75,7 +75,7 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.zcg.qmyy')" prop="qmyy">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-input type="text" :value="$t('page.business.zykgl.zcg.ysgh')" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -91,7 +91,7 @@ G<template>
 </template>
 
 <script>
-import { zcg_yygh, zcg_ysghBatch } from "@/api/business/zcg/zcg"
+import { zcg_ysgh, zcg_ysghBatch } from "@/api/business/zcg/zcg"
 import { mapGetters } from 'vuex'
 
 export default {
@@ -183,7 +183,7 @@ export default {
               this.$emit('callback')
             })
           } else {
-            zcg_yygh(this.form).then(response => {
+            zcg_ysgh(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/zcg/list.vue b/src/views/business/resource/zcg/list.vue
index af85c12..5500c8c 100644
--- a/src/views/business/resource/zcg/list.vue
+++ b/src/views/business/resource/zcg/list.vue
@@ -63,10 +63,10 @@
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
-     <!-- 钥匙发放 -->
-    <Ysff ref="Ysff" @callback="handleQuery"/>
-     <!-- 钥匙归还 -->
-    <Ysgh  ref="Ysgh" @callback="handleQuery" />
+    <!-- 钥匙发放 -->
+    <Ysff ref="Ysff" @callback="handleQuery" />
+    <!-- 钥匙归还 -->
+    <Ysgh ref="Ysgh" @callback="handleQuery" />
   </div>
 </template>
 
@@ -77,9 +77,7 @@ import Ysgh from "./comps/Ysgh";
 
 export default {
   name: "Zcg",
-  components: {
-    Ysff, Ysgh
-  },
+  components: { Ysff, Ysgh },
   data() {
     return {
       loading: true,