diff --git a/src/api/business/zcg/zcg.js b/src/api/business/zcg/zcg.js
index 8b939f4..6b26049 100644
--- a/src/api/business/zcg/zcg.js
+++ b/src/api/business/zcg/zcg.js
@@ -35,3 +35,13 @@ export function zcg_yyff(data) {
     data: data
   })
 }
+
+
+//批量钥匙归还
+export function zcg_ysghBatch(data) {
+  return request({
+    url: '/system/business/zcg/ysghBatch',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/api/business/zcg/zcgYj.js b/src/api/business/zcg/zcgYj.js
deleted file mode 100644
index ba5ac1f..0000000
--- a/src/api/business/zcg/zcgYj.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 查询暂存柜-关联药剂列表
-export function zcgYj_list(query) {
-  return request({
-    url: '/business/zcgYj/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询暂存柜-关联药剂详情
-export function zcgYj_info(query) {
-  return request({
-    url: '/business/zcgYj/info',
-    method: 'get',
-    params: query
-  })
-}
-
-// 保存暂存柜-关联药剂
-export function zcgYj_save(data) {
-  return request({
-    url: '/business/zcgYj/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除暂存柜-关联药剂
-export function zcgYj_delete(data) {
-  return request({
-    url: '/business/zcgYj/delete',
-    method: 'post',
-    data: data
-  })
-}
\ No newline at end of file
diff --git a/src/lang/en.js b/src/lang/en.js
index 1ccec7e..36e83aa 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -188,7 +188,22 @@ export default {
           glyj: '关联药剂',
           ffys: '发放钥匙',
           gh: '归还',
-          ysgh: '钥匙归还'
+          ysgh: '钥匙归还',
+          ysghts:'请确认是否归还以下钥匙',
+          ghr1Id:'钥匙1归还人',
+          ghr1mm:'钥匙1归还人密码',
+          ghr2Id:'钥匙2归还人',
+          ghr2mm:'钥匙2归还人密码',
+          jsr:'接收人',
+          jsrmm:'接收人密码',
+          qmyy:'签名意义',
+          remark:'备注',
+          lqr1Id:'钥匙1领取人',
+          lqr1mm:'钥匙1领取人密码',
+          lqr2Id:'钥匙2领取人',
+          lqr2mm:'钥匙2领取人密码',
+          ffr:'发放人',
+          ffrmm:'发放人密码',
         }
       }
     }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 01ec480..97fd884 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -188,7 +188,22 @@ export default {
           glyj: '关联药剂',
           ffys: '发放钥匙',
           gh: '归还',
-          ysgh: '钥匙归还'
+          ysgh: '钥匙归还',
+          ysghts:'请确认是否归还以下钥匙',
+          ghr1Id:'钥匙1归还人',
+          ghr1mm:'钥匙1归还人密码',
+          ghr2Id:'钥匙2归还人',
+          ghr2mm:'钥匙2归还人密码',
+          jsr:'接收人',
+          jsrmm:'接收人密码',
+          qmyy:'签名意义',
+          remark:'备注',
+          lqr1Id:'钥匙1领取人',
+          lqr1mm:'钥匙1领取人密码',
+          lqr2Id:'钥匙2领取人',
+          lqr2mm:'钥匙2领取人密码',
+          ffr:'发放人',
+          ffrmm:'发放人密码',
         }
       }
     }
diff --git a/src/views/business/resource/zcg/list.vue b/src/views/business/resource/zcg/list.vue
index 15b72d7..7e2c2de 100644
--- a/src/views/business/resource/zcg/list.vue
+++ b/src/views/business/resource/zcg/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container zcg">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
       <el-form-item :label="$t('page.business.zykgl.zcg.zcg') + '：'">
         <el-input v-model="queryParams.mc" placeholder="" clearable @change="handleQuery" />
@@ -8,7 +8,7 @@
         <el-input v-model="queryParams.jyrId" placeholder="" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('page.business.zykgl.zcg.zt') + '：'">
-        <el-select v-model="queryParams.zt" :placeholder="$t('form.placeholderSelect')" clearable @change="handleQuery" >
+        <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-select>
@@ -21,16 +21,16 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:Zcg:ghys']">{{
+        <el-button type="primary" :disabled="multiple" @click="handlePlgh" v-hasPermi="['business:Zcg:ghys']">{{
           $t('page.business.zykgl.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" />
-      <el-table-column :label="$t('page.business.zykgl.zcg.zcg')" align="left" prop="mc" width="250px"/>
-      <el-table-column :label="$t('page.business.zykgl.zcg.ys1jyr')" align="center" prop="lqr1Id" width="150px"/>
-      <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Id" width="150px"/>
+      <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" width="250px" />
+      <el-table-column :label="$t('page.business.zykgl.zcg.ys1jyr')" align="center" prop="lqr1Id" width="150px" />
+      <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Id" width="150px" />
       <el-table-column :label="$t('page.business.zykgl.zcg.zt')" align="center" width="150px">
         <template slot-scope="scope">
           <span v-if="scope.row.zt == 1">{{ $t('page.business.zykgl.zcg.wjy') }}</span>
@@ -40,10 +40,12 @@
       <el-table-column :label="$t('page.business.zykgl.zcg.glyj')" align="center" prop="glyj" />
       <el-table-column :label="$t('form.operate')" align="center" class-name="small-padding fixed-width" width="150px">
         <template slot-scope="scope">
-          <el-button size="mini" type="text"  @click="handleffys(scope.row)"
-            v-hasPermi="['business:Zcg:ffys']">{{ $t('page.business.zykgl.zcg.ffys') }}</el-button>
-          <el-button size="mini" type="text"  @click="handleghys(scope.row)"
-            v-hasPermi="['business:Zcg:ghys']">{{ $t('page.business.zykgl.zcg.gh') }}</el-button>
+          <el-button size="mini" type="text" v-if="scope.row.zt == 1" @click="handleffys(scope.row)"
+            v-hasPermi="['business:Zcg:ffys']">{{
+              $t('page.business.zykgl.zcg.ffys') }}</el-button>
+          <el-button size="mini" type="text" v-if="scope.row.zt == 5" @click="handleghys(scope.row)"
+            v-hasPermi="['business:Zcg:ghys']">{{
+              $t('page.business.zykgl.zcg.gh') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -51,9 +53,82 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
-    <el-dialog :title="$t('page.business.zykgl.zcg.ysgh')" :visible.sync="openYsgh" width="500px" append-to-body>
-      <el-form ref="resetYsgh" :model="formYsgh" :rules="rulesYsgh" label-width="80px">
-        
+    <el-dialog :title="$t('page.business.zykgl.zcg.ysgh')" :visible.sync="openYsgh" width="1000px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="formYsgh" :model="formYsgh" :rules="rulesYsgh" label-width="130px">
+        <template v-if="plYsgh">
+          <el-alert :title="$t('page.business.zykgl.zcg.ysghts') + '：'" type="error" :closable="false">
+          </el-alert>
+          <el-row style="margin:10px 0px;">
+            <el-col :span="24">
+              <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="lqr1Id"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Id"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.zykgl.zcg.glyj')" align="center" prop="glyj" />
+              </el-table>
+            </el-col>
+          </el-row>
+        </template>
+        <template v-else>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.zykgl.zcg.zcg')" prop="mc">
+                <el-input type="text" v-model="formYsgh.mc" maxlength="50" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.zykgl.zcg.glyj')" prop="glyj">
+                <el-input type="text" v-model="formYsgh.glyj" maxlength="50" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.ghr1Id')" prop="ghr1Id">
+              <el-input type="text" v-model="formYsgh.ghr1Id" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.ghr1mm')" prop="ghr1mm">
+              <el-input type="text" v-model="formYsgh.ghr1mm" maxlength="50" />
+            </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-input type="text" v-model="formYsgh.ghr2Id" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.ghr2mm')" prop="ghr2mm">
+              <el-input type="text" v-model="formYsgh.ghr2mm" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.jsr')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.jsrmm')" prop="jsrmm">
+              <el-input type="text" v-model="formYsgh.jsrmm" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.qmyy')" prop="qmyy">
+              <el-input type="text" v-model="formYsgh.qmyy" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="saveYsgh">{{ $t('form.confirm') }}</el-button>
@@ -61,19 +136,84 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="$t('page.business.zykgl.zcg.ysff')" :visible.sync="openYsff" width="500px" append-to-body>
-      <el-form ref="formYsff" :model="formYsff" :rules="rulesYsff" label-width="80px">
+    <el-dialog :title="$t('page.business.zykgl.zcg.ysff')" :visible.sync="openYsff" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="formYsff" :model="formYsff" :rules="rulesYsff" label-width="130px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.zcg')" prop="mc">
+              <el-input type="text" v-model="formYsff.mc" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.glyj')" prop="glyj">
+              <el-input type="text" v-model="formYsff.glyj" maxlength="500" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.qmyy')" prop="qmyy">
+              <el-input type="text" v-model="formYsff.qmyy" maxlength="50" disabled />
+            </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-input type="text" v-model="formYsff.remark" maxlength="200" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.lqr1Id')" prop="lqr1Id">
+              <el-input type="text" v-model="formYsff.lqr1Id" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.lqr1mm')" prop="lqr1mm">
+              <el-input type="text" v-model="formYsff.lqr1mm" maxlength="50" />
+            </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-input type="text" v-model="formYsff.lqr2Id" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.lqr2mm')" prop="lqr2mm">
+              <el-input type="text" v-model="formYsff.lqr2mm" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.ffr')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.zcg.ffrmm')" prop="ffrmm">
+              <el-input type="text" v-model="formYsff.ffrmm" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="saveYsff">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancelYsff">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { zcg_list, zcg_info, zcg_yygh, zcg_yyff } from "@/api/business/zcg/zcg"
+import { zcg_list, zcg_info, zcg_yygh, zcg_yyff, zcg_ysghBatch } from "@/api/business/zcg/zcg"
+import { mapGetters } from 'vuex'
 
 export default {
   name: "Zcg",
@@ -85,6 +225,7 @@ export default {
       multiple: true,
       total: 0,
       ZcgList: [],
+      selectList: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -93,19 +234,92 @@ export default {
         zt: null,
       },
       openYsff: false,
-      formYsff: {},
+      formYsff: {
+
+      },
       rulesYsff: {
+        glyj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       },
       openYsgh: false,
+      plYsgh: false,
       formYsgh: {},
       rulesYsgh: {
+        ghr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
   created() {
     this.getList()
   },
   methods: {
+    // 控制哪些行可选
+    checkSelectable(row, index) {
+      return row.zt === 5
+    },
+    handlePlgh() {
+      this.plYsgh = true
+      this.resetYsgh()
+      this.formYsgh.ids = this.selectList.map(item => item.id).join(',')
+      this.openYsgh = true
+    },
     getList() {
       this.loading = true
       zcg_list(this.queryParams).then(response => {
@@ -126,21 +340,29 @@ export default {
       this.formYsff = {
         id: null,
         mc: null,
-        bh: null,
-        yslqr1: null,
-        yslqr2: null,
-        zt: null
+        glyj: null,
+        qmyy: $t('page.business.zykgl.zcg.ysff'),
+        remark: null,
+        lqr1Id: null,
+        lqr2Id: null,
+        lqr1mm: null,
+        lqr2mm: null,
+        ffrmm: null
       }
       this.resetForm("resetYsff")
     },
     resetYsgh() {
       this.formYsgh = {
         id: null,
+        ids: null,
         mc: null,
-        bh: null,
-        yslqr1: null,
-        yslqr2: null,
-        zt: null
+        qmyy: $t('page.business.zykgl.zcg.ysgh'),
+        ghr1Id: null,
+        ghr2Id: null,
+        ghr1mm: null,
+        ghr2mm: null,
+        jsrId: null,
+        jsrmm: null
       }
       this.resetForm("resetYsgh")
     },
@@ -156,31 +378,39 @@ export default {
       this.ids = selection.map(item => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length
+      this.selectList = selection
     },
     handleffys(row) {
       this.resetYsff()
-      const id = row.id || this.ids
-      zcg_info(id).then(response => {
-        this.formYsff = response.data
-        this.openYsff = true
-      })
+      this.formYsff.id = row.id
+      this.formYsff.mc = row.mc
+      this.openYsff = true
     },
     handleghys(row) {
+      this.plYsgh = false
       this.resetYsgh()
-      const id = row.id || this.ids
-      zcg_info(id).then(response => {
-        this.formYsgh = response.data
+      zcg_info({ id: row.id }).then(response => {
+        this.formYsgh.id = response.data.id
+        this.formYsgh.mc = response.data.mc
+        this.formYsgh.glyj = response.data.glyj
         this.openYsgh = true
       })
     },
     saveYsgh() {
       this.$refs["formYsgh"].validate(valid => {
         if (valid) {
-          zcg_yygh(this.formYsgh).then(response => {
-            this.$modal.msgSuccess("操作成功")
-            this.openYsgh = false
-            this.getList()
-          })
+          if (this.plYsgh) {
+            zcg_ysghBatch(this.formYsgh).then(response => {
+              this.openYsgh = false
+              this.getList()
+            })
+          } else {
+            zcg_yygh(this.formYsgh).then(response => {
+              this.openYsgh = false
+              this.getList()
+            })
+          }
+
         }
       })
     },
@@ -188,7 +418,6 @@ export default {
       this.$refs["formYsff"].validate(valid => {
         if (valid) {
           zcg_yyff(this.formYsff).then(response => {
-            this.$modal.msgSuccess("操作成功")
             this.openYsff = false
             this.getList()
           })
@@ -198,3 +427,11 @@ export default {
   }
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss">
+.zcg {
+  .select-list {
+    margin: 10px 0px;
+  }
+}
+</style>
\ No newline at end of file