diff --git a/src/App.vue b/src/App.vue
index 4ffe5c2..5869ee0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -123,6 +123,14 @@ export default {
   display: none;
 }
 
+.el-dialog__header {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1) !important;
+}
+
+.el-dialog__footer {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1) !important;
+}
+
 /*搜索区域样式 */
 .search-area {
   input {
diff --git a/src/lang/en.js b/src/lang/en.js
index ffc2afe..f7da44a 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -29,12 +29,15 @@ export default {
     endDate:'end date',
     password:'password',
     signer:'signer',
-    remark:'remark',
+    signerPsw: '签名人密码',
     qmyy:'签名意义',
-    lock:'lock',
-    unlock:'unlock',
-    detail:'Detail',
-    gd:'归档',
+    signTime: '签名时间',
+    remark:'remark',
+    
+    lengthLimit: '长度不能超过',
+    notEmpty: '不能为空',
+    operationSuccess: '操作成功',
+    OperationFailed: '操作失败',
   },
   menu: {
     PersonalCenter: 'Personal Center',
diff --git a/src/lang/en/business/resource/zykgl/mjy.js b/src/lang/en/business/resource/zykgl/mjy.js
index b37a81b..9ef50d4 100644
--- a/src/lang/en/business/resource/zykgl/mjy.js
+++ b/src/lang/en/business/resource/zykgl/mjy.js
@@ -19,17 +19,19 @@ export default {
     plsd:'批量锁定',
     plgd:'批量归档',
 
-    ff:'发放',
-    gh:'归还',
+    lock:'锁定',
+    unlock:'解锁',
+    detail:'详情',
+    guidang:'归档',
+    jiedang:'解档',
+    jieyue:'借阅',
+    guihuan:'归还',
+    fafang:'发放',
+    ysff:'钥匙发放',
     czrq:'处置容器',
     czyj:'处置药剂',
     xgkc:'修改库存',
     shxgkc:'审核修改库存',
     shbj:'审核编辑',
 
-    gd:'归档',
-    jd:'解档',
-    jy:'借阅',
-    gh:'归还',
-
 }
\ No newline at end of file
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 2b5eb94..36c39cd 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -33,10 +33,7 @@ export default {
     qmyy:'签名意义',
     signTime: '签名时间',
     remark:'备注',
-    lock:'锁定',
-    unlock:'解锁',
-    detail:'详情',
-    gd:'归档',
+   
     lengthLimit: '长度不能超过',
     notEmpty: '不能为空',
     operationSuccess: '操作成功',
diff --git a/src/lang/zh/business/resource/zykgl/mjy.js b/src/lang/zh/business/resource/zykgl/mjy.js
index e7644d9..49fa070 100644
--- a/src/lang/zh/business/resource/zykgl/mjy.js
+++ b/src/lang/zh/business/resource/zykgl/mjy.js
@@ -19,16 +19,20 @@ export default {
     plsd:'批量锁定',
     plgd:'批量归档',
 
-    ff:'发放',
-    gh:'归还',
+    lock:'锁定',
+    unlock:'解锁',
+    detail:'详情',
+    guidang:'归档',
+    jiedang:'解档',
+    jieyue:'借阅',
+    guihuan:'归还',
+    fafang:'发放',
+    ysff:'钥匙发放',
     czrq:'处置容器',
     czyj:'处置药剂',
     xgkc:'修改库存',
     shxgkc:'审核修改库存',
     shbj:'审核编辑',
 
-    gd:'归档',
-    jd:'解档',
-    jy:'借阅',
-    gh:'归还',
+  
 }
\ No newline at end of file
diff --git a/src/views/business/resource/mjy/comps/Bj.vue b/src/views/business/resource/mjy/comps/Bj.vue
new file mode 100644
index 0000000..46c8d6a
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Bj.vue
@@ -0,0 +1,157 @@
+G<template>
+  <div >
+    <!-- 编辑弹窗 -->
+    <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>
+          <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/mjy/comps/Czrq.vue b/src/views/business/resource/mjy/comps/Czrq.vue
new file mode 100644
index 0000000..e9efb90
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Czrq.vue
@@ -0,0 +1,157 @@
+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/mjy/comps/Czyj.vue b/src/views/business/resource/mjy/comps/Czyj.vue
new file mode 100644
index 0000000..c166c7a
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Czyj.vue
@@ -0,0 +1,157 @@
+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/mjy/comps/Ff.vue b/src/views/business/resource/mjy/comps/Ff.vue
new file mode 100644
index 0000000..f5c8976
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Ff.vue
@@ -0,0 +1,157 @@
+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-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/mjy/comps/Gd.vue b/src/views/business/resource/mjy/comps/Gd.vue
index bd709f0..319bdb5 100644
--- a/src/views/business/resource/mjy/comps/Gd.vue
+++ b/src/views/business/resource/mjy/comps/Gd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('form.gd')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.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">
         <template v-if="isBatch">
            <el-alert :title="$t('page.business.zykgl.mjy.gdts') " type="error" :closable="false">
diff --git a/src/views/business/resource/mjy/comps/Gh.vue b/src/views/business/resource/mjy/comps/Gh.vue
new file mode 100644
index 0000000..9990905
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Gh.vue
@@ -0,0 +1,157 @@
+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-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/mjy/comps/Jd.vue b/src/views/business/resource/mjy/comps/Jd.vue
new file mode 100644
index 0000000..1a419c2
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Jd.vue
@@ -0,0 +1,157 @@
+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-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: "MjyJd",
+  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/mjy/comps/Js.vue b/src/views/business/resource/mjy/comps/Js.vue
index 658657e..51321b3 100644
--- a/src/views/business/resource/mjy/comps/Js.vue
+++ b/src/views/business/resource/mjy/comps/Js.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('form.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.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">
diff --git a/src/views/business/resource/mjy/comps/Jy.vue b/src/views/business/resource/mjy/comps/Jy.vue
new file mode 100644
index 0000000..ef5352c
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Jy.vue
@@ -0,0 +1,157 @@
+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-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/mjy/comps/Sd.vue b/src/views/business/resource/mjy/comps/Sd.vue
index 9218abe..ead4034 100644
--- a/src/views/business/resource/mjy/comps/Sd.vue
+++ b/src/views/business/resource/mjy/comps/Sd.vue
@@ -1,7 +1,7 @@
 G<template>
   <div >
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('form.lock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <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">
diff --git a/src/views/business/resource/mjy/comps/Shbj.vue b/src/views/business/resource/mjy/comps/Shbj.vue
new file mode 100644
index 0000000..eadbc83
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Shbj.vue
@@ -0,0 +1,157 @@
+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/mjy/comps/Shxgkc.vue b/src/views/business/resource/mjy/comps/Shxgkc.vue
new file mode 100644
index 0000000..371509f
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Shxgkc.vue
@@ -0,0 +1,157 @@
+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/mjy/comps/Xgkc.vue b/src/views/business/resource/mjy/comps/Xgkc.vue
new file mode 100644
index 0000000..ee1c6ad
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Xgkc.vue
@@ -0,0 +1,157 @@
+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-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/mjy/comps/Ysff.vue b/src/views/business/resource/mjy/comps/Ysff.vue
new file mode 100644
index 0000000..6350ec1
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Ysff.vue
@@ -0,0 +1,157 @@
+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-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/mjy/list.vue b/src/views/business/resource/mjy/list.vue
index 9e551be..bd85c14 100644
--- a/src/views/business/resource/mjy/list.vue
+++ b/src/views/business/resource/mjy/list.vue
@@ -142,63 +142,59 @@
               <!-- 详情 -->
               <el-button size="mini" type="text" @click="handleXq(scope.row)"
                 v-hasPermi="['business:resource:mjy:list']">{{
-                  $t('form.detail') }}</el-button>
+                  $t('page.business.zykgl.mjy.detail') }}</el-button>
               <!-- 发放 -->
-              <el-button size="mini" type="text" @click="handleffys(scope.row)"
+              <el-button size="mini" type="text" @click="handleFf(scope.row)"
                 v-hasPermi="['business:resource:mjy:ff']">{{
-                  $t('page.business.zykgl.mjy.ff') }}</el-button>
-              <!-- 归还 -->
-              <el-button size="mini" type="text" @click="handleghys(scope.row)"
-                v-hasPermi="['business:resource:mjy:gh']">{{
-                  $t('page.business.zykgl.mjy.gh') }}</el-button>
+                  $t('page.business.zykgl.mjy.fafang') }}</el-button>
               <!-- 处置药剂 -->
-              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+              <el-button size="mini" type="text" @click="handleCzyj(scope.row)"
                 v-hasPermi="['business:resource:mjy:czyj']">{{
                   $t('page.business.zykgl.mjy.czyj') }}</el-button>
               <!-- 处置容器 -->
-              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+              <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="handleghys(scope.row)"
+              <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="handleghys(scope.row)"
+              <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="handleghys(scope.row)"
+              <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="handleghys(scope.row)"
+              <el-button size="mini" type="text" @click="handleShxgkc(scope.row)"
                 v-hasPermi="['business:resource:mjy:shxgkc']">{{
                   $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
               <!-- 锁定 -->
               <el-button size="mini" type="text" @click="handleSd(scope.row)"
                 v-hasPermi="['business:resource:mjy:sd']">{{
-                  $t('form.lock') }}</el-button>
+                  $t('page.business.zykgl.mjy.lock') }}</el-button>
               <!-- 解锁 -->
               <el-button size="mini" type="text" @click="handleJs(scope.row)"
                 v-hasPermi="['business:resource:mjy:js']">{{
-                  $t('form.unlock') }}</el-button>
+                  $t('page.business.zykgl.mjy.unlock') }}</el-button>
               <!-- 归档 -->
               <el-button size="mini" type="text" @click="handleGd(scope.row)"
                 v-hasPermi="['business:resource:mjy:gd']">{{
-                  $t('page.business.zykgl.mjy.gd') }}</el-button>
+                  $t('page.business.zykgl.mjy.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+              <el-button size="mini" type="text" @click="handleJd(scope.row)"
                 v-hasPermi="['business:resource:mjy:jd']">{{
-                  $t('page.business.zykgl.mjy.jd') }}</el-button>
+                  $t('page.business.zykgl.mjy.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+              <el-button size="mini" type="text" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:mjy:jy']">{{
-                  $t('page.business.zykgl.mjy.jy') }}</el-button>
+                  $t('page.business.zykgl.mjy.jieyue') }}</el-button>
               <!-- 归还 -->
-              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+              <el-button size="mini" type="text" @click="handleGh(scope.row)"
                 v-hasPermi="['business:resource:mjy:gh']">{{
-                  $t('page.business.zykgl.mjy.gh') }}</el-button>
+                  $t('page.business.zykgl.mjy.guihuan') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -212,6 +208,28 @@
       <Js ref="Js" @callback="handleQuery" />
       <!-- 归档 -->
       <Gd ref="Gd" @callback="handleQuery" />
+      <!-- 解档 -->
+      <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" />
+      <!-- 归还 -->
+      <Gh ref="Gh" @callback="handleQuery" />
+      <!-- 发放 -->
+      <Ff ref="Ff" @callback="handleQuery" />
+      <!-- 处置药剂 -->
+      <Czyj ref="Czyj" @callback="handleQuery" />
+      <!-- 处置容器 -->
+      <Czrq ref="Czrq" @callback="handleQuery" />
+      <!-- 钥匙发放 -->
+      <Ysff ref="Ysff" @callback="handleQuery" />
     </template>
   </div>
 </template>
@@ -221,11 +239,22 @@ import { mjy_list } from "@/api/business/mjy/mjy"
 import Sd from "./comps/Sd";
 import Js from "./comps/Js";
 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 Czyj from "./comps/Czyj";
+import Ysff from "./comps/Ysff";
 
 export default {
   name: "Mjy",
-  components: { Sd, Js, Gd, Xq },
+  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh,Czyj,Czrq,Ff,Ysff },
   data() {
     return {
       showDetail: false,
@@ -254,6 +283,54 @@ 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)
+    },
+    //处置药剂
+    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)
+    },
     //关闭详情
     cancelXq() {
       this.showDetail = false
@@ -283,6 +360,10 @@ export default {
     handleGd(row) {
       this.$refs.Gd.show(row)
     },
+    //解档
+    handleJd(row) {
+      this.$refs.Jd.show(row)
+    },
     //批量锁定
     handlePlsd() {
       this.$refs.Sd.showBatch(this.selectList)