diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index eac305a..f6a3af3 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -155,3 +155,12 @@ export function mjy_plff(data) {
     data: data
   })
 }
+
+//钥匙发放
+export function mjy_ysff(data) {
+  return request({
+    url: '/system/business/mjy/ysff',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy/mjy.js
index 2b55946..beced89 100644
--- a/src/lang/zh/business/resource/mjy/mjy.js
+++ b/src/lang/zh/business/resource/mjy/mjy.js
@@ -53,5 +53,21 @@ export default {
     md:'目的',
     ckmz:'出库毛重',
 
+    ckl:'出库量',
+    ckldw:'出库单位',
+    ffzytj:'转移条件',
+    ckmz:'出库毛重',
+    ckmzdw:'出库毛重单位',
+    lqr1Mc:'领取人1',
+    lqr2Mc:'领取人2',
+    ffr1Mc:'发放人1',
+    ffr2Mc:'发放人2',
+    ffr2Mc:'发放人2',
+    ffxm:'目的',
+
+    lqr1Id:'钥匙1领取人',
+    lqr2Id:'钥匙2领取人',
+    ffr:'发放人'
+  
   
 }
\ No newline at end of file
diff --git a/src/views/business/resource/mjy/comps/Ysff.vue b/src/views/business/resource/mjy/comps/Ysff.vue
index 54c0d6c..c2a42df 100644
--- a/src/views/business/resource/mjy/comps/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/Ysff.vue
@@ -1,38 +1,52 @@
 G<template>
   <div>
     <!-- 钥匙发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.ysff')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.zykgl.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 :style="isBatch ? 'display:block' : 'display:none'">
+        <div>
           <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.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-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.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"
+                  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"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.lqr1Mc')" align="center" prop="lqr1Mc"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.lqr2Mc')" align="center" prop="lqr2Mc"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.ffr1Mc')" align="center" prop="ffr1Mc"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.ffr2Mc')" 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.ffxm')" align="center" prop="ffxmMc"
+                  width="150px" />
+              </el-table>
             </el-col>
           </el-row>
         </div>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.zcgMc')" 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" :value="form.qmyy" maxlength="50" disabled
+              <el-input type="text" v-model="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -40,13 +54,57 @@ G<template>
         <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"
+              <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.zykgl.mjy.lqr1Id')" prop="lqr1Id">
+              <el-input type="text" v-model="form.lqr1Id" maxlength="50" 
+                :placeholder="$t('form.placeholderInput')" />
+            </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.zykgl.mjy.lqr2Id')" prop="lqr2Id">
+              <el-input type="text" v-model="form.lqr2Id" maxlength="50" 
+                :placeholder="$t('form.placeholderInput')" />
+            </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.zykgl.mjy.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>
@@ -57,16 +115,14 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_ysff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
-  components: { SelectList },
+  name: "MjyYsff",
+  components: {},
   data() {
     return {
-      isBatch: false,
       ids: [],
       selectList: [],
       open: false,
@@ -76,7 +132,37 @@ export default {
           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'
+        }],
       }
     }
   },
@@ -100,40 +186,29 @@ export default {
     },
     reset() {
       this.form = {
-        id: null,
         ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
+        qmyy: '钥匙发放',
+        zcgId: null,
+        sdrmm: null,
+        remark: null,
+        lqr1Id: null,
+        lqr2Id: null,
+        lqr1mm: null,
+        lqr2mm: null,
+        ffrId: null,
+        ffrmm: 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')
-            })
-          }
-
+          let params = this.form
+          params.list = this.selectList
+          mjy_ysff(params).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }